6 years agoDo a disconnect if ApnContext is ready but retrying or failed.
Wink Saville [Tue, 14 May 2013 18:09:20 +0000]
Do a disconnect if ApnContext is ready but retrying or failed.

This change allows enabling of a ready ApnContext to reconnect if the
ApnContext is IDLE, FAILED or RETRYING. Without this change toggling
wifi or otherwise enabling the connection would not cause the connection
to be retried. Instead, toggling airplane mode would be required.

Bug: 8849653
Change-Id: I83f44dbfd412f4b0122a2108e22f36db94c59d18

6 years agoSend notifyDataConnection on changes to data connection.
Wink Saville [Fri, 10 May 2013 19:01:58 +0000]
Send notifyDataConnection on changes to data connection.

Previously notification was sent only when voice radio technology
changed, but it needs to be when data RAT changed. Also send it with
there is a data registration changes.

Bug: 8786016
Change-Id: I5a53e13821efde4ebd3dbe5f062e7729f321497b

6 years agoOn EVENT_CONNECT in DcRetryingState do not go inactive.
Wink Saville [Fri, 3 May 2013 17:33:01 +0000]
On EVENT_CONNECT in DcRetryingState do not go inactive.

Going to DcInactiveState from DcRetryingState on EVENT_CONNECT causes
us to forget we are retrying the original connection and if this is
a different connection we can disconnect completely when we shouldn't.

For example, when we're retrying the default connection and we get a
request to connect to supl or mms which are short lived connections
we'll become completely disconnected.

Bug: 8770139
Change-Id: Id271bc7f88d12e6d9fe9451b09f9c9412e6959f4

6 years agoAdd synchronized to toString.
Wink Saville [Tue, 30 Apr 2013 02:09:27 +0000]
Add synchronized to toString.

If toString is called at the same time removeWaitingApn we can
get a ConncurrentModificationException.

Bug: 8727610
Change-Id: I95c2181a1a5abc1a28a9e4eb337b674e49847103

6 years agoSupport WiFi only device at runtime.
Wink Saville [Tue, 23 Apr 2013 21:29:30 +0000]
Support WiFi only device at runtime.

Now that ConnectivityService determines if TYPE_MOBILE is supported at
runtime don't need the special code in RIL.java.

Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91

6 years agoMerge "On data only devices use data registration state." into jb-mr2-dev
Wink Saville [Mon, 22 Apr 2013 20:39:01 +0000]
Merge "On data only devices use data registration state." into jb-mr2-dev

6 years agoOn data only devices use data registration state.
Wink Saville [Fri, 19 Apr 2013 22:07:52 +0000]
On data only devices use data registration state.

Some operators may report that the voice registration state is
not in service on a data only device. So use the Data registration
state for data only devices.

Bug: 8213254
Change-Id: Ieb6eef65fa5afb3d2c1a39b32a5bc5825ccc7f1c

6 years agoLoad call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.
Jake Hamby [Thu, 18 Apr 2013 21:39:46 +0000]
Load call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.

After loading EF_CFF_CPHS, use it to set mCallForwardingEnabled flag
if EF_CFIS record is missing or invalid.

Also fixes a few typos and updates an incorrect Javadoc comment.

Bug: 8554894
Change-Id: I3dfe3c915ad15b65781cd4e4d65cfa5c71a46ad6

6 years agoMerge "Default CellInfoListRate to off, Integer.MAX_VALUE." into jb-mr2-dev
Wink Saville [Thu, 18 Apr 2013 17:06:41 +0000]
Merge "Default CellInfoListRate to off, Integer.MAX_VALUE." into jb-mr2-dev

6 years agoDefault CellInfoListRate to off, Integer.MAX_VALUE.
Wink Saville [Wed, 17 Apr 2013 19:49:29 +0000]
Default CellInfoListRate to off, Integer.MAX_VALUE.

For now be sure CellInfoListRate is off.

Bug: 8621996
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13

6 years agoEnable CMAS alert tone and alert dialog for AMBER alerts.
Jake Hamby [Tue, 16 Apr 2013 18:51:36 +0000]
Enable CMAS alert tone and alert dialog for AMBER alerts.

The CMAS UI did not play the CMAS alert tone for AMBER alerts,
showing them as a regular notification instead. Carrier requirements
state that the CMAS alert tone should play for all CMAS alerts.
Remove the AMBER alert exception from

Bug: 7417676
Change-Id: If24f6b4ebd4633f671beebbe7784b6cc012c358a

6 years agoMerge "Fix some frameworks-telephony test compile errors." into jb-mr2-dev
Jake Hamby [Thu, 11 Apr 2013 18:13:54 +0000]
Merge "Fix some frameworks-telephony test compile errors." into jb-mr2-dev

6 years ago Telephony: Return 'null' as per TelephonyManager need
Ajay Nambi [Wed, 10 Apr 2013 23:48:47 +0000]
Telephony: Return 'null' as per TelephonyManager need

    Return 'null' instead of "" (empty string) when Line1AlphaTag,
    IccSerialNumber and Msisdn are unavailable.

    Bug: 8449375
    Change-Id: I5d8052922363f4b3b900bcdea490afe22fedce4f

Change-Id: Iaa77764af8f2c12c11c990c6c23152ba1dac84cb

6 years agoFix some frameworks-telephony test compile errors.
Jake Hamby [Wed, 10 Apr 2013 22:45:10 +0000]
Fix some frameworks-telephony test compile errors.

Fix some frameworks-telephony test case compile errors due to
package name change for ApnSetting and additional methods added
to BaseCommands.

Change-Id: I72a9caabd6b7d09e9d0f1e39ab7bd24fa0e60594

6 years agoMerge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
Wink Saville [Tue, 9 Apr 2013 22:50:11 +0000]
Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev

6 years agoTelephony: Send complete path for EF-IMG(4F20) for RUIM cards.
Shriram Ganesh [Sun, 22 Jul 2012 19:11:01 +0000]
Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.

When retrieving the EF_IMG from an RUIM the icon load fails
because the path to the EF is incorrectly specified as "img"

Bug: 8443193
Change-Id: I76f981d5334274b34e2e1a752fd0a550458e4e86

6 years agoAdd FW support for CellInfo RIL commands.
Wink Saville [Tue, 9 Apr 2013 18:00:27 +0000]
Add FW support for CellInfo RIL commands.

Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1

6 years agoFix SignalStrength response.
Wink Saville [Mon, 8 Apr 2013 18:42:08 +0000]
Fix SignalStrength response.

Use the new SignalStrength constructor with gsmFlag.

Also, remove code in responseStrings which would cause
it to return an empty array if RILJ_LOGV was true.

Bug: 8561333
Change-Id: Ie6eb3b0335e8d7ea114ec70b3fb72e917094632e

6 years agoMerge "IccCardApplicatonStatus should not throw exceptions." into jb-mr2-dev
Wink Saville [Wed, 3 Apr 2013 17:57:14 +0000]
Merge "IccCardApplicatonStatus should not throw exceptions." into jb-mr2-dev

6 years agoIccCardApplicatonStatus should not throw exceptions.
Wink Saville [Wed, 3 Apr 2013 00:09:02 +0000]
IccCardApplicatonStatus should not throw exceptions.

Change from throwing exception to logging an error and mapping
to an XXXX_UKNOWN value.

Bug: 7449696
Change-Id: Iebed1c7893d120fb02821017643ee070d634bb19

6 years agoMerge "make new API to retrieve group identifier level1" into jb-mr2-dev
Robert Greenwalt [Tue, 2 Apr 2013 19:18:36 +0000]
Merge "make new API to retrieve group identifier level1" into jb-mr2-dev

6 years agoFix TODO in ApnContext#setDataConnectionAc.
Wink Saville [Fri, 29 Mar 2013 18:32:57 +0000]
Fix TODO in ApnContext#setDataConnectionAc.

Callers that really need to tearDown should call it directly
rather than as a side effect of setDataConnectionAc. The fixes
a "DcActiveState ERROR no such apnContext=" message caused by
an unnecssary tearDown when disconnecting.

Change-Id: I11321d098444659d99dec97b59041cefebb3285e

6 years agoMerge "Add fix and add some debugging." into jb-mr2-dev
Wink Saville [Fri, 29 Mar 2013 18:02:11 +0000]
Merge "Add fix and add some debugging." into jb-mr2-dev

6 years agoAdd fix and add some debugging.
Wink Saville [Thu, 28 Mar 2013 22:28:07 +0000]
Add fix and add some debugging.

Bug: 8492574
Change-Id: I9cb1ab4ec3efb8186a4dd83736781835e1847720

6 years agoMap DcConstants.RETRYING to PhoneConstants.State.DISCONNECTED.
Wink Saville [Thu, 28 Mar 2013 22:24:45 +0000]
Map DcConstants.RETRYING to PhoneConstants.State.DISCONNECTED.

Previously RETRYING was mapped to CONNECTING this means that
ConnectivityService will not remove the route and a subsequent
change in IP addresses won't work because an old route has not
been removed.

By mapping to DISCONNECTED ConnectivityService will remove the
route. Another alternative would be to add PhoneConstants.State.RETRYING
but this is a simpler change so we'll try it first.

Bug: 8486114
Change-Id: I1c9946a1e441feda83f13730e835445624a87218

6 years agoUse new mechanism to get messenger to StateTracker
Robert Greenwalt [Thu, 21 Mar 2013 00:10:33 +0000]
Use new mechanism to get messenger to StateTracker

Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c

6 years agoMerge commit '903be2fc' into fix-merge-conflict
Alex Yakavenka [Wed, 27 Mar 2013 19:52:47 +0000]
Merge commit '903be2fc' into fix-merge-conflict

* commit '903be2fc':
  Telephony: Null check for adncache before search/update.

Change-Id: I1e498b4783e6c3381c14309019420142f3b8b15d

6 years agomake new API to retrieve group identifier level1
Sungmin Choi [Thu, 21 Mar 2013 06:41:09 +0000]
make new API to retrieve group identifier level1

For mvno, user can add or edit mvno data field. To pre-provide
the mvno data of the edited apn when the user selects one of
the mvno types, need to support IMSI, SPN, and GID1 data.
To support GID1, make API to retrieve group identifier level1.

Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb

6 years agoam ead6ee84: Merge "Telephony: Null check for adncache before search/update."
Wink Saville [Wed, 27 Mar 2013 17:03:30 +0000]
am ead6ee84: Merge "Telephony: Null check for adncache before search/update."

* commit 'ead6ee84aa6275062b64a05dafd14a0c17da8ea3':
  Telephony: Null check for adncache before search/update.

6 years agoMerge "Telephony: Null check for adncache before search/update."
Wink Saville [Wed, 27 Mar 2013 16:57:15 +0000]
Merge "Telephony: Null check for adncache before search/update."

6 years agoMerge "Allow and :: as default gateways" into jb-mr2-dev
Lorenzo Colitti [Wed, 27 Mar 2013 00:14:50 +0000]
Merge "Allow and :: as default gateways" into jb-mr2-dev

6 years agoMerge commit '310b322d' into fix-merge-conflict
Wink Saville [Tue, 26 Mar 2013 23:43:44 +0000]
Merge commit '310b322d' into fix-merge-conflict

* commit '310b322d':
  Telephony: Delay SIM IO until SIM_READY

Change-Id: I50618a1fb06a7eb465f7a0d9b4b8d6fb53ad1339

6 years agoam f57fcc91: Merge "Telephony: Delay SIM IO until SIM_READY"
Wink Saville [Tue, 26 Mar 2013 22:07:01 +0000]
am f57fcc91: Merge "Telephony: Delay SIM IO until SIM_READY"

* commit 'f57fcc91426dfa4c3efe2f8ee64a6a39bf708a97':
  Telephony: Delay SIM IO until SIM_READY

6 years agoMerge "Telephony: Delay SIM IO until SIM_READY"
Wink Saville [Tue, 26 Mar 2013 21:55:07 +0000]
Merge "Telephony: Delay SIM IO until SIM_READY"

6 years agoTelephony: Delay SIM IO until SIM_READY
Alex Yakavenka [Thu, 21 Mar 2013 17:56:08 +0000]
Telephony: Delay SIM IO until SIM_READY

When SIM_REFRESH with SIM_INIT is received we need to
reread EFs but only if and when app is ready.

Bug: 8445450
Change-Id: I066a1e6547cfdcba91230f5fbfa8050864327c5d

6 years agoAllow and :: as default gateways
Lorenzo Colitti [Tue, 26 Mar 2013 03:47:49 +0000]
Allow and :: as default gateways

On point-to-point interfaces, some RILs return the unspecified
address ( or ::) as the gateway. This is correct, as
routes pointing at point-to-point interfaces don't need
gateways. Currently, telephony ignores these routes, causing
loss of connectivity (for example, when using an IPv6 APN on
Galaxy Nexus). Allow these routes to be set.

Bug: 8475171
Bug: 8276725
Change-Id: I3a770628c9717bb6e451a523417401b56ba55763

6 years agoresolved conflicts for merge of 4eede890 to jb-mr2-dev
Jake Hamby [Tue, 26 Mar 2013 01:11:03 +0000]
resolved conflicts for merge of 4eede890 to jb-mr2-dev

Change-Id: I7ee1d93d832275ad04d4e6bbae68d22ae86322ac

6 years agoam 3ab6a16a: Merge "Telephony: Fix IntRangeManager"
Jake Hamby [Mon, 25 Mar 2013 22:56:16 +0000]
am 3ab6a16a: Merge "Telephony: Fix IntRangeManager"

* commit '3ab6a16ab4d9c6fd842a46ed02aee25391e1b8fa':
  Telephony: Fix IntRangeManager

6 years agoMerge "Telephony: Fix IntRangeManager"
Jake Hamby [Mon, 25 Mar 2013 22:48:05 +0000]
Merge "Telephony: Fix IntRangeManager"

6 years agoMerge "Use Build.IS_DEBUGGABLE" into jb-mr2-dev
Wink Saville [Mon, 25 Mar 2013 22:41:31 +0000]
Merge "Use Build.IS_DEBUGGABLE" into jb-mr2-dev

6 years agoUse Build.IS_DEBUGGABLE
Wink Saville [Mon, 25 Mar 2013 22:11:05 +0000]

Change-Id: I8d4a2e83b8cdcf86cafb622013868f117d0701ef

6 years agoMerge "Testing property to verify roaming behavior." into jb-mr2-dev
Jeff Sharkey [Mon, 25 Mar 2013 22:04:58 +0000]
Merge "Testing property to verify roaming behavior." into jb-mr2-dev

6 years agoTesting property to verify roaming behavior.
Jeff Sharkey [Mon, 25 Mar 2013 21:22:39 +0000]
Testing property to verify roaming behavior.

Bug: 6777372
Change-Id: Ia698f0eca6f05a6327f6c8b36cfe14f51f01e6e3

6 years agoRename a couple variables in IccRecords.
Wink Saville [Mon, 25 Mar 2013 17:04:57 +0000]
Rename a couple variables in IccRecords.

Also add getIccId for use by PhoneBase.

Change-Id: I51eaf09bfc498f1f1edc3f697838978f56b7bd4e

6 years agoRename a few files and variables.
Wink Saville [Sat, 23 Mar 2013 19:42:57 +0000]
Rename a few files and variables.

Change-Id: I4e90dbf57797b9485920f943e24fa7a4c29d070b

6 years agoMove retrying into DC.
Wink Saville [Fri, 22 Mar 2013 18:10:25 +0000]
Move retrying into DC.

This is the first step in refactoring for bug 4772191.

Bug: 4772191
Change-Id: Id54a20ab192783c63939158670faaf531a527640

6 years agoMerge commit 'f606e5cc' into fix-merge-conflict
Wink Saville [Thu, 21 Mar 2013 14:14:11 +0000]
Merge commit 'f606e5cc' into fix-merge-conflict

* commit 'f606e5cc':
  RIL: Correct the RIL_REQUEST_DIAL api missmatch


Change-Id: Ib2b477628e14ca221acad35f4a2cf9a44170a33e

6 years agoam 0f7c9029: Merge "RIL: Correct the RIL_REQUEST_DIAL api missmatch"
Wink Saville [Thu, 21 Mar 2013 13:25:18 +0000]
am 0f7c9029: Merge "RIL: Correct the RIL_REQUEST_DIAL api missmatch"

* commit '0f7c9029877f3643824a2c3cb567f6b96f189eb5':
  RIL: Correct the RIL_REQUEST_DIAL api missmatch

6 years agoMerge "RIL: Correct the RIL_REQUEST_DIAL api missmatch"
Wink Saville [Thu, 21 Mar 2013 12:25:29 +0000]
Merge "RIL: Correct the RIL_REQUEST_DIAL api missmatch"

6 years agoRIL: Correct the RIL_REQUEST_DIAL api missmatch
Bjorn Andersson [Wed, 10 Oct 2012 18:12:05 +0000]
RIL: Correct the RIL_REQUEST_DIAL api missmatch

The uusPresent is written twice in dial() so it will always be
marked as absent.

Change-Id: Id50a4dc8a3eefdaf2284e410382428c52e9b5ef1

6 years agoam f7bf2056: am 63152045: Merge "add MVNO check routine"
Robert Greenwalt [Sat, 16 Mar 2013 00:58:58 +0000]
am f7bf2056: am 63152045: Merge "add MVNO check routine"

* commit 'f7bf205684ca101326e57921d81963da7541e3c6':
  add MVNO check routine

6 years agoam fbd959c2: am ae6a4485: Merge "add columns of Carrier about MVNO"
Robert Greenwalt [Sat, 16 Mar 2013 00:58:58 +0000]
am fbd959c2: am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'fbd959c2f0e9e420d1b65f14463ba8da04e76655':
  add columns of Carrier about MVNO

6 years agoam 63152045: Merge "add MVNO check routine"
Robert Greenwalt [Sat, 16 Mar 2013 00:56:53 +0000]
am 63152045: Merge "add MVNO check routine"

* commit '631520453bea1841dbc808a051bd09eb85599b4b':
  add MVNO check routine

6 years agoam ae6a4485: Merge "add columns of Carrier about MVNO"
Robert Greenwalt [Sat, 16 Mar 2013 00:56:53 +0000]
am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'ae6a44857a0b3d9e37c53f2cfd42e13003c68408':
  add columns of Carrier about MVNO

6 years agoMerge "add MVNO check routine"
Robert Greenwalt [Sat, 16 Mar 2013 00:00:32 +0000]
Merge "add MVNO check routine"

6 years agoadd MVNO check routine
Sungmin Choi [Wed, 6 Feb 2013 23:34:54 +0000]
add MVNO check routine

modify createApnList() API as the followings:

1.1 mvno != null (already matched mvno info)
1.2 mvno == cur_mvno_info
1.2.1 result.add
2.1 mvno == null (not yet)
2.2 mvnoMatch check
2.2.1 clear prev results.
2.2.2 result add (mvno)
2.3 mvno_type is null
2.3.1 result add (normal)

match mvno as the followings:
1. if mvno_type is spn, compare spn of SIM
2. if mvno_type is imsi, compare imsi of SIM
3. if mvno_type is gid, compare gid of SIM

Bug: 8143480
Change-Id: Idf0aa1ddf139f80c7d33b1e3315493d32dbf433a

6 years agoMerge "add columns of Carrier about MVNO"
Robert Greenwalt [Sat, 16 Mar 2013 00:00:06 +0000]
Merge "add columns of Carrier about MVNO"

6 years agoadd columns of Carrier about MVNO
Sungmin Choi [Wed, 6 Feb 2013 23:34:20 +0000]
add columns of Carrier about MVNO

To recognize MVNO, use new fields, MVNO_MATCH_DATA and MVNO_TYPE
(SPN, IMSI, GID(Group Identifier Level 1)).

Bug: 8143480
Change-Id: Idfa06c6f39a2c15ff4f0815724823f44b76ac819

6 years agoMerge commit 'b21b57c0' into manualmerge
Robert Greenwalt [Fri, 15 Mar 2013 23:27:38 +0000]
Merge commit 'b21b57c0' into manualmerge


Change-Id: Ic998e70207851e7e00f56d6e8591e53834987358

6 years agoam c13624a4: Merge "get group identifier level1 (Gid1)"
Robert Greenwalt [Fri, 15 Mar 2013 22:43:51 +0000]
am c13624a4: Merge "get group identifier level1 (Gid1)"

* commit 'c13624a4a0b63c492fa8b336ae737f831bde50eb':
  get group identifier level1 (Gid1)

6 years agoMerge "get group identifier level1 (Gid1)"
Robert Greenwalt [Fri, 15 Mar 2013 22:05:30 +0000]
Merge "get group identifier level1 (Gid1)"

6 years agofix PDK no-java build
keunyoung [Wed, 13 Mar 2013 22:12:31 +0000]
fix PDK no-java build

- As this component is in PDK, it should not be built when necessary
  frameworks libraries are not available.
- For full platform source tree, the ...JAVA_SUPPORT_LEVEL is platform.

Change-Id: I6d37970ab7a3e5183d3a04b003ec3f81f907abc8

6 years agoam b9de4496: am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:20 +0000]
am b9de4496: am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b9de449616f5f0ab8eb6e819bb581f9c353316f9':

6 years agoam 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:34:30 +0000]
am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2':

6 years agoam eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:32:01 +0000]
am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eb69ddd4db1f1a421f1d27e1d42d557f0897f08e':

6 years agoam c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do...
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:28:33 +0000]
am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c2e35f33ae6a31d4420672ad4dad46ca297c0db7':

6 years agoam 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:00 +0000]
am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '932e8e5dacd4e154d5c7b94f396a4d32de931551':

6 years agoReconcile with jb-mr1-release - do not merge
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:44 +0000]
Reconcile with jb-mr1-release - do not merge

6 years agoTelephony: Fix IntRangeManager
Rika Brooks [Wed, 9 May 2012 23:47:18 +0000]
Telephony: Fix IntRangeManager

-Fix to populate SmsBroadcastConfigInfo list with all the possible
 range lists upon enable and disable to match previous implementation.
-Fix ClientRange to be ordered by start id, then by end id.
-Fix enableRange to handle missing cases:
 -enable exact same range, i.e. new [x, y], existing [x, y]
 -enable range that is already enclosed in existing range i.e.
  adding [3, 3] to existing range [1,3]
 -enable (startId -1) == range.endId, i.e. new [3, y] existing [1, 2]
-Fix where range.endId is not updated correctly
-Fix disableRange to first update mRange then call updateRange.
-Add more unit test cases.

Bug: 8355035
Change-Id: I83308c76ed28c6f753326aeaac6bec1d88c01b39

6 years agoMerge commit '958e7316' into fix-merge-conflict
Wink Saville [Mon, 11 Mar 2013 18:02:51 +0000]
Merge commit '958e7316' into fix-merge-conflict

* commit '958e7316':
  Telephony: Set TP-RD to 1 in case of retry

Change-Id: I298e588b1076686e2c7c4b3714b46d2637b04079

6 years agoMerge "Telephony: Set TP-RD to 1 in case of retry"
Wink Saville [Mon, 11 Mar 2013 15:34:38 +0000]
Merge "Telephony: Set TP-RD to 1 in case of retry"

6 years agoTelephony: Set TP-RD to 1 in case of retry
Rika Brooks [Thu, 7 Jun 2012 00:16:56 +0000]
Telephony: Set TP-RD to 1 in case of retry

per TS 23.040 Section In the case where no response or an
RP-ERROR with an appropriate cause value (see 3GPP TS 24.011 [13]) is
received in response to an SMS-SUBMIT, then the MS shall automatically
repeat the SMS-SUBMIT but must use the same TP-MR value
and set the TP-RD bit to 1 (see

Bug:  8323645
Change-Id: I1c7ebc67f80a6eeba456ab0dc5f6331a038d7ab2

6 years agoam 5779b57f: Merge "Send user confirmation instead of Terminal Response"
Wink Saville [Wed, 6 Mar 2013 17:44:39 +0000]
am 5779b57f: Merge "Send user confirmation instead of Terminal Response"

* commit '5779b57fe7530dfca8d814be0cbd13c7bad5d643':
  Send user confirmation instead of Terminal Response

6 years agoMerge commit '63a6a12c' into fix-merge-conflict
Wink Saville [Wed, 6 Mar 2013 17:26:53 +0000]
Merge commit '63a6a12c' into fix-merge-conflict

* commit '63a6a12c':
  Telephony: Fix for first pause DTMF digit

Change-Id: I345e0e32d8230c16c28c953de5848cd095438e34

6 years agoMerge "Send user confirmation instead of Terminal Response"
Wink Saville [Wed, 6 Mar 2013 16:18:27 +0000]
Merge "Send user confirmation instead of Terminal Response"

6 years agoMerge "Telephony: Fix for first pause DTMF digit"
Wink Saville [Wed, 6 Mar 2013 16:16:40 +0000]
Merge "Telephony: Fix for first pause DTMF digit"

6 years agoTelephony: Fix for first pause DTMF digit
Shruthi Krishnan [Mon, 20 Dec 2010 23:04:21 +0000]
Telephony: Fix for first pause DTMF digit

As per 3GPP requirement first pause sequence also should maintain 3 sec
delay. Added fix to wait for 3 sec time before sending DTMF digits to

Change-Id: I6041614b544cc9c24521bee9ad505439b810ff86

6 years agoSend user confirmation instead of Terminal Response
Abhishek Adappa [Tue, 15 Jan 2013 19:36:49 +0000]
Send user confirmation instead of Terminal Response

On certain proactive commands like  Setup Call/Open Channel,
a confirmation dialog is displayed to the user to confirm or reject the
call. If the user hits the back key to dismiss the dialog or the user
 hits 'No', consider that as the user rejecting the call, instead
of sending a Terminal Response.

Bug: 8302972
Change-Id: I23d57f726018a6805ef455f6069dbab8e6dd14f0

6 years agoSend Power-off notifications
Robert Greenwalt [Mon, 4 Mar 2013 23:36:20 +0000]
Send Power-off notifications

If we update the state of the old servicestate and the new before calling done
nothing will get sent out (no change).  Instead, just put the new state
in the mNewSS and call done - it'll copy it to mSS and note the diff and
notify everyone.

Change-Id: I5fee4805245c547175bbd8b0e18f407edfc8c3d8

6 years agoget group identifier level1 (Gid1)
Hyejin Kim [Wed, 6 Feb 2013 23:28:54 +0000]
get group identifier level1 (Gid1)

To recognize MVNO(Mobile Virtual Network Operator), need some filters,
Service Provider Name(SPN), International Mobile Subscriber ID(IMSI),
and Group Identifier Level1(Gid1).
The GID1 elementary files on the SIM are specified in GSM 11.11 (ETS 300 977)

To get Gid1, implement it.

Bug: 8143480
Change-Id: I44f9d622240a73c42ea6418d2d55e1dae23f3b81

6 years agoam a6577f4b: Merge "Telephony: Return \'null\' when SubscriberId and Line1Number...
Wink Saville [Thu, 28 Feb 2013 16:35:28 +0000]
am a6577f4b: Merge "Telephony: Return \'null\' when SubscriberId and Line1Number are unavailable"

* commit 'a6577f4b162c9f6d8084e19a6cc5792cf52e4872':
  Telephony: Return 'null' when SubscriberId and Line1Number are unavailable

6 years agoMerge "Telephony: Return 'null' when SubscriberId and Line1Number are unavailable"
Wink Saville [Thu, 28 Feb 2013 15:18:20 +0000]
Merge "Telephony: Return 'null' when SubscriberId and Line1Number are unavailable"

6 years agoTelephony: Return 'null' when SubscriberId and Line1Number are unavailable
Abhishek Adappa [Tue, 24 Jul 2012 23:14:47 +0000]
Telephony: Return 'null' when SubscriberId and Line1Number are unavailable

Return 'null' instead of "" (empty string) when Subscriber Id and
Line1Number are unavailable. This confirms to the definition of the
public API.

Bug: 8284793
Change-Id: Ie6395623cf413d51f6e10316aded71e2eaf5592c

6 years agoam 22c3bbde: Merge "Fix build."
Elliott Hughes [Wed, 27 Feb 2013 02:43:13 +0000]
am 22c3bbde: Merge "Fix build."

* commit '22c3bbde1128029c4d4e6fe34ee0b56f530629ac':
  Fix build.

6 years agoFix build.
Elliott Hughes [Wed, 27 Feb 2013 02:10:51 +0000]
Fix build.

TimeZones was renamed to the more accurate TimeZoneNames.

(cherry-pick of 96c87e2f014207dc5c55f7c8fafd1e666080d784.)

Change-Id: I52f8b3eb6e5183ba486a68820c7c3af3863ffdb5

6 years agoMerge "Fix build."
Elliott Hughes [Wed, 27 Feb 2013 02:11:39 +0000]
Merge "Fix build."

6 years agoFix build.
Elliott Hughes [Wed, 27 Feb 2013 02:10:51 +0000]
Fix build.

TimeZones was renamed to the more accurate TimeZoneNames.

Change-Id: Ia44bc852cd7f65466a97e815e3289a61ee22cb0f

6 years agoMerge commit 'b575731e' into fix-merge-conflict
Wink Saville [Tue, 26 Feb 2013 20:23:09 +0000]
Merge commit 'b575731e' into fix-merge-conflict

* commit 'b575731e':
  Update PS state when radio off or unavailable

Change-Id: I87d25d297ef455763d20b2f9b6cad920514a4f05

6 years agoMerge "Update PS state when radio off or unavailable"
Wink Saville [Tue, 26 Feb 2013 18:00:13 +0000]
Merge "Update PS state when radio off or unavailable"

6 years agoUpdate PS state when radio off or unavailable
Ye Jingjing [Thu, 6 Sep 2012 08:12:08 +0000]
Update PS state when radio off or unavailable

When radio off or unavailable, CS state has been reset,
but PS state has not updated, in fact both CS and PS
state should be out of service. So SMS will try to be
sent out when sending sms, the result is "could not send"
rather than sms being queued for sending.
This fix will reset PS state to power off or out of
service when radio off or unavailable accordingly.

Bug: 8265430
Change-Id: I46e962c30021ff1273dcc559579bdedc7f432a64

6 years agoClean up member variables.
Wink Saville [Sat, 23 Feb 2013 21:23:48 +0000]
Clean up member variables.

Change-Id: Ib60f350131ade626aca682407ea0b4377b16f6c6

6 years agoClean up
Wink Saville [Fri, 22 Feb 2013 23:08:33 +0000]
Clean up

 - Add @Overrides where needed.
 - Update javadoc comments
 - Remove extra semi-colons
 - Rename DataConnection.java to DataConnectionBase.java
 - Rename GsmDataConnection.java to DataConnection.java
 - Add defaults to switch statements
 - Remove/fix most "if (false)" statements. Fixed by using a CONSTANT
 - Fix hidden variables by hoisting to base class or renaming
 - Tweak some debug output

Change-Id: If38de2fdeaacafbf40cdfd7f84dc5c52030ba2a3

6 years agoMove DataConnection related classes to their own package.
Wink Saville [Thu, 21 Feb 2013 17:34:34 +0000]
Move DataConnection related classes to their own package.

Change-Id: I34ee9e87545e6b15ebf4d3ec101d4ed3d322f7b2

6 years agoam de707749: Merge "Telephony: Update Permanent Fail and Event Loggable Types"
Wink Saville [Wed, 20 Feb 2013 22:53:30 +0000]
am de707749: Merge "Telephony: Update Permanent Fail and Event Loggable Types"

* commit 'de70774912571d7e2d9de627a91df933b2d5f3c1':
  Telephony: Update Permanent Fail and Event Loggable Types

6 years agoMerge "Telephony: Update Permanent Fail and Event Loggable Types"
Wink Saville [Wed, 20 Feb 2013 22:17:21 +0000]
Merge "Telephony: Update Permanent Fail and Event Loggable Types"

6 years agoTelephony: Update Permanent Fail and Event Loggable Types
Chris Lei [Wed, 5 Sep 2012 01:33:36 +0000]
Telephony: Update Permanent Fail and Event Loggable Types

- Updating isPermanentFail() and isEventLoggable() to better
  comply with "no retry" requirements in ril.h

Change-Id: I377eba7ec0203e41ae7689192a41f6b260a8775a

6 years agoMerge "Partial fix for b8022095"
Wink Saville [Tue, 12 Feb 2013 23:46:25 +0000]
Merge "Partial fix for b8022095"

6 years agoam 64f509b2: Merge "Fix for storing CPHS MWI messages with store type"
Jake Hamby [Tue, 12 Feb 2013 23:43:52 +0000]
am 64f509b2: Merge "Fix for storing CPHS MWI messages with store type"

# By Bj√∂rn Ekberg
# Via Gerrit Code Review (1) and Zoran Jovanovic (1)
* commit '64f509b256eccf899910a449857b095aa2cbc714':
  Fix for storing CPHS MWI messages with store type

6 years agoMerge "Fix for storing CPHS MWI messages with store type"
Jake Hamby [Tue, 12 Feb 2013 22:45:26 +0000]
Merge "Fix for storing CPHS MWI messages with store type"

6 years agoPartial fix for b8022095
Wink Saville [Tue, 12 Feb 2013 20:14:44 +0000]
Partial fix for b8022095

With the changes to the DC the list of ApnContexts is cleared when
a DC disconnects. So the connectionId is invalid, instead send the
APN type information which fixes this retry problem.

A larger fix is coming where retries are done in DC but this will help
for now.

Bug: 8022095
Change-Id: I7364d1108c4be853a9d711eb8771d05a7640fe19