2 years agoMerge "Add unit tests for ImsVideoCallProviderWrapper." into oc-dev
Tyler Gunn [Wed, 17 May 2017 20:05:16 +0000]
Merge "Add unit tests for ImsVideoCallProviderWrapper." into oc-dev

2 years agoMerge "Revert "flacky unit test"" into oc-dev
Chen Xu [Wed, 17 May 2017 06:34:57 +0000]
Merge "Revert "flacky unit test"" into oc-dev

2 years agoMerge "Fix setCdmaBroadcastConfig in RIL.java to include all categories." into oc-dev
TreeHugger Robot [Wed, 17 May 2017 05:00:41 +0000]
Merge "Fix setCdmaBroadcastConfig in RIL.java to include all categories." into oc-dev

2 years agoRevert "flacky unit test"
Chen Xu [Wed, 17 May 2017 00:09:49 +0000]
Revert "flacky unit test"

This reverts commit 0b187f0fba954859718c4ad8d1b4751343142d78.

Change-Id: I880cb6aef85eca42ddbdd74a7c9ac2cac215fd93

2 years agoMerge "Convert unsigned uint8 fields in RIL interface to unsigned int." into oc-dev
TreeHugger Robot [Tue, 16 May 2017 23:07:14 +0000]
Merge "Convert unsigned uint8 fields in RIL interface to unsigned int." into oc-dev

2 years agoConvert unsigned uint8 fields in RIL interface to unsigned int.
Amit Mahajan [Tue, 16 May 2017 01:11:56 +0000]
Convert unsigned uint8 fields in RIL interface to unsigned int.

Conversion is via byte which loses the unsigned-ness by default.

Test: basic telephony sanity
Bug: 37911659
Change-Id: I39312e8c280450d68aff016d9c582e24ecc43a0c

2 years agoFix setCdmaBroadcastConfig in RIL.java to include all categories.
Amit Mahajan [Mon, 15 May 2017 21:03:05 +0000]
Fix setCdmaBroadcastConfig in RIL.java to include all categories.

Also disable some flaky tests.

Test: manual
Bug: 38109424
Merged-in: I15a26a8f5134e34cc00e57161faca5924ab82a80
Change-Id: I15a26a8f5134e34cc00e57161faca5924ab82a80

2 years agoflacky unit test
fionaxu [Mon, 15 May 2017 21:29:38 +0000]
flacky unit test

Test: Telephony unit tests
bug: 29579544
Change-Id: Iec35a7bd8a0b3585733a1f69db73d10275767405

2 years agoFixed flaky unit tests
Jack Yu [Sun, 14 May 2017 17:04:23 +0000]
Fixed flaky unit tests

Test: Telephony unit tests
bug: 29579544
Merged-In: If732d23d9f9bc0bb7b4dc6246d2af116c755cdc9
Change-Id: If732d23d9f9bc0bb7b4dc6246d2af116c755cdc9
(cherry picked from commit e11ff87802f9f4a26f042b6f0fe318371b17c976)

2 years agoAdd unit tests for ImsVideoCallProviderWrapper.
Tyler Gunn [Thu, 11 May 2017 00:47:13 +0000]
Add unit tests for ImsVideoCallProviderWrapper.

Specifically adding tests to ensure that the issue described in the bug
is handled correctly.

Test: Manual/unit
Bug: 35304446
Change-Id: I40fb4b7df15c55114bda506442e5efa0aefbd809

2 years agoMerge "Fixed that APN context stuck in SCANNING state" into oc-dev
Jack Yu [Mon, 15 May 2017 19:12:38 +0000]
Merge "Fixed that APN context stuck in SCANNING state" into oc-dev

2 years agoMerge "Set CDMA data roaming based on TSB58 roaming indicator if voice is not in...
Jayachandran Chinnakkannu [Sat, 13 May 2017 00:49:32 +0000]
Merge "Set CDMA data roaming based on TSB58 roaming indicator if voice is not in service" into oc-dev

2 years agoMerge "Set isGsm flag based on currently camped voice and data RATs" into oc-dev
Jayachandran Chinnakkannu [Sat, 13 May 2017 00:48:14 +0000]
Merge "Set isGsm flag based on currently camped voice and data RATs" into oc-dev

2 years agoMerge "Map CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE to NORMAL disconnect cause" into...
Jayachandran Chinnakkannu [Sat, 13 May 2017 00:35:05 +0000]
Merge "Map CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE to NORMAL disconnect cause" into oc-dev

2 years agoFixed that APN context stuck in SCANNING state
Jack Yu [Thu, 11 May 2017 20:47:56 +0000]
Fixed that APN context stuck in SCANNING state

1. When data retry fails at trySetupData, we should apply
   FAILED state to the APN context otherwise it will be
   in SCANNING state forever since we are not going to
   schedule for the next retry.
2. When we get a new network request in applyNewState,
   if the APN is in SCANNING state, we should trySetupData
   immediately instead of waiting for the next retry,
   which might still minutes/hours away from now.

Test: Telephony sanity tests
bug: 38113800
Merged-In: I6edd7555327f41ee713a256edfe641a41ca6f969
Change-Id: I6edd7555327f41ee713a256edfe641a41ca6f969

2 years agoMerge "Reset IMS Capabilities when IMS disconnects" into oc-dev
Brad Ebinger [Fri, 12 May 2017 20:07:23 +0000]
Merge "Reset IMS Capabilities when IMS disconnects" into oc-dev

2 years agoMerge "reset carrier actions on APM" into oc-dev
Chen Xu [Fri, 12 May 2017 18:52:14 +0000]
Merge "reset carrier actions on APM" into oc-dev

2 years agoreset carrier actions on APM
fionaxu [Wed, 10 May 2017 01:07:49 +0000]
reset carrier actions on APM

Bug: 37913717
Bug: 37850264
Test: Manual test. toggle APM
Test: runtest --path
Change-Id: Ie2d4c453438c1cabb7576e4d1aa4e61adba43c5e

2 years agoMerge "Parse response from hal even in case of error." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 22:08:17 +0000]
Merge "Parse response from hal even in case of error." into oc-dev

2 years agoSet isGsm flag based on currently camped voice and data RATs
Jayachandran C [Fri, 5 May 2017 23:40:09 +0000]
Set isGsm flag based on currently camped voice and data RATs

Use currently camped RATs to determine isGsm the flag
instead of checking both phone type and camped RATs.

Test: Verified the signal bar for the following use cases
 - SRLTE (1x & LTE) mode
 - hVoLTE mode
 - 2G only, 3G preferred, LTE preferred
 - Cellular and IWLAN registered

Voice calls:
 - CS calls on 1x, GSM, UMTS for all possible voice, data RATs
 - IMS calls on LTE and IWLAN for all possible voice, data RATs

Bug: 36644977
Change-Id: Ifd996a2c902c7238f7328a42f0401c8d626e89e4

2 years agoSet CDMA data roaming based on TSB58 roaming indicator if voice is not in service
Jayachandran C [Sun, 7 May 2017 19:55:51 +0000]
Set CDMA data roaming based on TSB58 roaming indicator if voice is not in service

Existing implementation:
1. CDMA voiceRoaming is set based on regState and roaming indicator.
2. CDMA dataRoaming is set based on regState only.
3. CDMA dataRoaming is overwritten with voiceRoaming if voice is
   in service.

If voice is not in service then the CDMA dataRoaming set based on
regState alone could be incorrect because it didn't use roaming
indicator from modem.

This change sets CDMA dataRoaming based on TSB58 roaming indicator
(similar to setting voiceRoaming) if voice is not service.

Note: As per VoiceRegStateResult from radio types.hal the TSB58
roaming indicator shall be sent if device is registered on a
CDMA or EVDO system.

Test: Forced device to Evdo only and verified roaming state
Bug: 37917767
Change-Id: I3cc7fff61cea296afe17215a33b1b4c80972db13

2 years agoParse response from hal even in case of error.
Amit Mahajan [Thu, 11 May 2017 02:10:46 +0000]
Parse response from hal even in case of error.

Test: manual sim pin testing, basic telephony sanity
Bug: 37941868
Change-Id: I1a0b576c84ebb9bf4ac3de41538d148a1a043c05

2 years agoMap CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE to NORMAL disconnect cause
Jayachandran C [Thu, 11 May 2017 18:40:28 +0000]

This change also optimizes imports

Test: Following scenarios for VoLTE and CS call and
      verified the cause sent in PreciseCallState.

 1) Conference call merge
 2) Conference call, one remote party ends the call
 3) Conference call, all remote parties end the call
 4) Conference call, hangup locally
 5) Normal call and hangup locally
 6) Normal call and remote party ends the call

Bug: 38225047
Change-Id: I7ea843683eebfa2e60683ddffd11995b426f0a12

2 years agoReset IMS Capabilities when IMS disconnects
Brad Ebinger [Wed, 10 May 2017 22:54:49 +0000]
Reset IMS Capabilities when IMS disconnects

When IMS deregisters, reset the IMS capabilities
to false so we do not accidently return the wrong
result for TelephonyManager.isVolteAvailable()
if the ImsService does not set the capabilities to
false before deregistering.

Test: Telephony Unit Tests
Bug: 36374918
Change-Id: I42b066f8a97770f23d71a0c646f384f7cbfdb57b

2 years agoMerge "Notify ImsService Status Callbacks correctly" into oc-dev
Brad Ebinger [Wed, 10 May 2017 20:42:34 +0000]
Merge "Notify ImsService Status Callbacks correctly" into oc-dev

2 years agoMerge "Convert NV reset type into ResetNvType defined in types.hal" into oc-dev
Jayachandran Chinnakkannu [Wed, 10 May 2017 18:03:34 +0000]
Merge "Convert NV reset type into ResetNvType defined in types.hal" into oc-dev

2 years agoConvert NV reset type into ResetNvType defined in types.hal
Jayachandran C [Wed, 10 May 2017 02:37:11 +0000]
Convert NV reset type into ResetNvType defined in types.hal

Test: 1. Sprint OMADM execution and verified device camps on service
      2. FDR on Marlin and verified vendor code receives resetType 3

Bug: 37849113
Bug: 38169447
Change-Id: Iaf66c6f29a09d83f3f8bef73b65a589ea4c5df03

2 years agoNotify ImsService Status Callbacks correctly
Brad Ebinger [Sat, 6 May 2017 00:45:36 +0000]
Notify ImsService Status Callbacks correctly

Adds support in the ImsServiceController for multiple
Feature listeners for one feature. Also adds support for
signaling the ImsFeature to remove the binder callback when
the feature is removed.

Stops Phone from listening to IMS_SERVUICE_UP/DOWN when
using the ImsResolver.

Bug: 38001858
Test: Unit Tests
Merged-In: I920605b32160fdce9fcd3b4c0100804d3590397f
Change-Id: I920605b32160fdce9fcd3b4c0100804d3590397f

2 years agoMerge "Force BSIC value to only one byte" into oc-dev
Nathan Harold [Wed, 10 May 2017 02:17:21 +0000]
Merge "Force BSIC value to only one byte" into oc-dev

2 years agoMerge "Synchronize on mImsPhone to avoid NPE" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 20:54:29 +0000]
Merge "Synchronize on mImsPhone to avoid NPE" into oc-dev

2 years agoMerge "voicemail notification settings cleanup" into oc-dev
Chen Xu [Tue, 9 May 2017 17:49:06 +0000]
Merge "voicemail notification settings cleanup" into oc-dev

2 years agoMerge "Register for EVENT_RESTRICTED_STATE_CHANGED irrespective of phone type." into...
Sanket Padawe [Tue, 9 May 2017 16:56:05 +0000]
Merge "Register for EVENT_RESTRICTED_STATE_CHANGED irrespective of phone type." into oc-dev

2 years agoRegister for EVENT_RESTRICTED_STATE_CHANGED irrespective of phone type.
Sanket Padawe [Wed, 3 May 2017 22:14:19 +0000]
Register for EVENT_RESTRICTED_STATE_CHANGED irrespective of phone type.

+ Removed some dead code as well.

Bug: 37377132
Test: manual
Change-Id: I6ddddc39e69e0850e838b6f3cf1bc4adda682281

2 years agovoicemail notification settings cleanup
fionaxu [Sat, 6 May 2017 00:21:52 +0000]
voicemail notification settings cleanup

- remove UI preference for voicemail notification ringtone & vibration
settings as they are not functioning with notification channel
- have a new Notification Preference under voicemailSettings which will
navigate to the system settings screen for that channel.
- modify telephonymanager API getVoiceMailRingToneUri and
isVoiceMailVibrationEnabled from sharedPreference to NotificationChannel
- more cleanup work needed till next API bump for telephonyManager APIs
setVoicemailVibrationEnabled and setVoicemailRingToneUri

Bug: 37912316
Test: Manaul test
Change-Id: Ic28713c012672b991b8f131545c06e1dbfd6765f

2 years agoSynchronize on mImsPhone to avoid NPE
Hall Liu [Fri, 5 May 2017 23:23:34 +0000]
Synchronize on mImsPhone to avoid NPE

During a disconnect, the binder thread from the IMS stack may set
mImsCall to null simulataneously with the main thread calling methods on
mImsCall after a null check. Adding synchronization to prevent an NPE.

Change-Id: Id7874e802d56ab7d3912c779dedd1cccdb923db6
Test: no deadlocks while calling
Fixes: 37945103

2 years agoMerge "Fix hidl conversion bug for setCallForward()" into oc-dev
Sanket Padawe [Fri, 5 May 2017 22:13:36 +0000]
Merge "Fix hidl conversion bug for setCallForward()" into oc-dev

2 years agoFix hidl conversion bug for setCallForward()
Sanket Padawe [Fri, 5 May 2017 19:19:19 +0000]
Fix hidl conversion bug for setCallForward()

Test: manual
Change-Id: Iad9d1f219956470c9217fbee91637ec2f7e6460a
Fix: 37991478

2 years agoMerge "Better handle MSIM DDS changed event" into oc-dev
Brad Ebinger [Thu, 4 May 2017 17:11:46 +0000]
Merge "Better handle MSIM DDS changed event" into oc-dev

2 years agoForce BSIC value to only one byte
Nathan Harold [Tue, 2 May 2017 20:31:00 +0000]
Force BSIC value to only one byte

BSIC is being sign-extended when copied to a java integer.
Truncate the length keeping the magnitude of the lowest byte.

Bug: 37787893
Test: compilation
Change-Id: I7807be3321e9c90f23351549c86ebe03dc239d80
(cherry picked from commit b808a31b9b0b5104b4ff32860c7ff9d52c12a7c8)

2 years agoMerge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev
Tom Taylor [Thu, 4 May 2017 00:04:51 +0000]
Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev

2 years agoBetter handle MSIM DDS changed event
Brad Ebinger [Tue, 18 Apr 2017 18:44:54 +0000]
Better handle MSIM DDS changed event

On DSDS MSIM devices, when Default Data Subscription event
is received, the ImsService may choose to switch which
Slot ID is active.

This change better handles that switch and removes a
crash that was happening due to
ImsServiceProxy#getFeatureStatus getting called

Bug: 37361882
Test: Run Telephony unit test
Merged-In: If0f2e3c90de378421bc17d029bf1e6a3ced6bb34
Merged-In: I2cfef49f833e330289f172bae7e422f5afa5fc40
Change-Id: If61332d8c2d4dacb96d27d706abac6afc612749b

2 years agoMerge "Fix issues with MMI/USSD codes." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 22:38:06 +0000]
Merge "Fix issues with MMI/USSD codes." into oc-dev

2 years agoMerge "fix crash from carriersignalAgent under sip call" into oc-dev
Chen Xu [Wed, 3 May 2017 22:13:32 +0000]
Merge "fix crash from carriersignalAgent under sip call" into oc-dev

2 years agofix crash from carriersignalAgent under sip call
fionaxu [Wed, 3 May 2017 18:46:54 +0000]
fix crash from carriersignalAgent under sip call

Bug: 37917990
Test: Manual test with sip call
Change-Id: Ia6d74928655d60d35062e6a8e920788759d99efd

2 years agoMerge "Do not log pin and puk" into oc-dev
Sooraj Sasindran [Wed, 3 May 2017 19:12:52 +0000]
Merge "Do not log pin and puk" into oc-dev

2 years agoMerge "support locale change for notification channels" into oc-dev
Chen Xu [Wed, 3 May 2017 16:42:43 +0000]
Merge "support locale change for notification channels" into oc-dev

2 years agoDo not log pin and puk
Sooraj Sasindran [Fri, 28 Apr 2017 02:57:39 +0000]
Do not log pin and puk

Do not log pin and puk


Test: verified logs are not coming
Change-Id: I7ef94b4ad809db4eb679ee2a022379bd779cf6ef

2 years agosupport locale change for notification channels
fionaxu [Mon, 1 May 2017 23:13:14 +0000]
support locale change for notification channels

- create all notification channels when phone process started to provide
an consistent UX experience
- support locale changes

Test: Manual test with different languages
Bug: 37911731
Change-Id: Ib2d2bb27d307a3570923ca176f7d02f0c1985a43

2 years agoMerge "Add startCaptivePortalApp to ConnectivityServiceMock." into oc-dev
Lorenzo Colitti [Tue, 2 May 2017 04:38:50 +0000]
Merge "Add startCaptivePortalApp to ConnectivityServiceMock." into oc-dev

2 years ago37544704 PduPersister is not doing a safe Uri comparison
Tom Taylor [Thu, 27 Apr 2017 17:55:27 +0000]
37544704 PduPersister is not doing a safe Uri comparison

* The PduPersister had some code where it checked uris for
equality, but didn't use the safe .equals method.

Test: manual test of sending and receiving mms's.

Bug: 37544704

Change-Id: Ice99eef84ebc92a45387b107a3806392e6269e9e

2 years agoAdd startCaptivePortalApp to ConnectivityServiceMock.
Lorenzo Colitti [Mon, 1 May 2017 11:22:49 +0000]
Add startCaptivePortalApp to ConnectivityServiceMock.

Bug: 36656914
Test: mmm -j64 frameworks/base/services frameworks/opt/telephony
Change-Id: I946d7c8e4e88caf777c82b4174631efc92552216

2 years agoFix issues with MMI/USSD codes.
Tyler Gunn [Wed, 26 Apr 2017 17:47:49 +0000]
Fix issues with MMI/USSD codes.

There a few issues here:
1. The queuing of MMI codes for handUssdRequest was not working properly.
I have removed it in favor of returning an error if there is an ongoing
MMI code.  The functionality was pretty broken and despite my efforts I
could not sort all of it out well enough to be confident that it could be
2. There was no attempt to retry handleUssdRequest calls on IMS.
3. There was a missing fallback to CS for regular MMI requests.

Test: Manual
Bug: 37484804
Merged-In: I8b2ed5ed9c29cdf95532096d60487656946b4cc0
Change-Id: I8b2ed5ed9c29cdf95532096d60487656946b4cc0
(cherry picked from commit 3aa9ed7d17a6b8401d71d9e09dce873038ec6b28)

Malcolm Chen [Tue, 25 Apr 2017 01:20:24 +0000]
from Intent class to SubscriptionManager class.

Bug: 37497166
Test: Manual
Change-Id: Ifeedf974328cd3d839d7f66bf41a91c479d66316

2 years agoMerge "new carrier signal/action on carrier action reset" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 21:35:42 +0000]
Merge "new carrier signal/action on carrier action reset" into oc-dev

2 years agonew carrier signal/action on carrier action reset
fionaxu [Wed, 26 Apr 2017 22:03:23 +0000]
new carrier signal/action on carrier action reset

notify carrier apps on carrier action reset, usually when sim loaded
or sim absent. only sent those reset signals to configured carrier apps
carrier apps could reply on this new intent instead of sim_state_changed
to avoid unnecessary wake-ups, for example an VZW app might be awake
even under AT&T due to the general SIM_STATE_CHANGED broadcast.

Bug: 34626476
Test: Manual test on TMO and READY/ZIP SIM
Change-Id: Icc8bd843ddaccd3a96950831c45ff6825fb0cc9e

2 years agoMerge "Notification method renames." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:51:37 +0000]
Merge "Notification method renames." into oc-dev

2 years agoFixed unit test case failure
Jack Yu [Tue, 25 Apr 2017 22:06:36 +0000]
Fixed unit test case failure

bug: 36221436
Test: unit test
Change-Id: I24b3bc6ebdb2168539bfc6ac46c3f4fa38b86cec

2 years agoNotification method renames.
Julia Reynolds [Tue, 25 Apr 2017 19:39:46 +0000]
Notification method renames.

Test: make
Bug: 37672218
Change-Id: I35abef5f015454c553fd0e06eaa221bb76ce41e7

2 years agoMerge "Use non-wakeable alarm for data-stall alarm." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 16:48:45 +0000]
Merge "Use non-wakeable alarm for data-stall alarm." into oc-dev

2 years agoMerge "Disable failing unit tests." into oc-dev
Amit Mahajan [Tue, 25 Apr 2017 00:19:15 +0000]
Merge "Disable failing unit tests." into oc-dev

2 years agoDisable failing unit tests.
Amit Mahajan [Wed, 19 Apr 2017 18:11:14 +0000]
Disable failing unit tests.

All tests pass locally now and should pass on treehugger and apct
as well.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests
Bug: 29579544
Change-Id: I8a038f60e6bed490a2e969258b126f4dfa1f6cb9

2 years agoUse non-wakeable alarm for data-stall alarm.
Ajay Dudani [Fri, 21 Apr 2017 23:27:08 +0000]
Use non-wakeable alarm for data-stall alarm.

Previous behavior with use of ELAPSED_REALTIME_WAKEUP would wake up
the device for data stall check if device is in sleep state.

It should be safe to defer data stall check until device wakes up
from sleep.  Update to use ELAPSED_REALTIME instead.

Bug: 36221436
Test: Compile test.
Change-Id: I057214c655910aedf4c87cba45a041e527047ac9

2 years agoMerge "telephony service support notification channel" into oc-dev
Chen Xu [Fri, 21 Apr 2017 21:26:26 +0000]
Merge "telephony service support notification channel" into oc-dev

2 years agoFixed crash in data connection
Jack Yu [Fri, 21 Apr 2017 19:37:04 +0000]
Fixed crash in data connection

Need to check if mConnectionParams is null before
accessing it.

bug: 30936226
Test: manual
Change-Id: Ia3ec371b40f6c53f988897f5cb6f1099f415b94f

2 years agotelephony service support notification channel
fionaxu [Thu, 20 Apr 2017 00:43:05 +0000]
telephony service support notification channel

Bug: 37475310
Test: Manual Test
Change-Id: Idb7697337dfd02a2fbb0ff7f3b1a3f69582c7f2e

2 years agoMerge "Added unmetered use only data connection support" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:20:39 +0000]
Merge "Added unmetered use only data connection support" into oc-dev

2 years agoAdded unmetered use only data connection support
Jack Yu [Tue, 11 Apr 2017 17:33:47 +0000]
Added unmetered use only data connection support

If a data network is brought up while data is turned off because
the request APN is unmetered, when data is enabled again, this data
network needs to be torn down so a full capable data network can
be re-established.

Test: Unit tests
bug: 30936226
Change-Id: Ia233c80fa14980713bfe66bef61f1c6f4a8c1c0d

2 years agoMerge "Fixed roaming related issues" into oc-dev
Jack Yu [Thu, 20 Apr 2017 23:52:35 +0000]
Merge "Fixed roaming related issues" into oc-dev

2 years agoUse SubscriptionId instead of SubId
Jordan Liu [Wed, 19 Apr 2017 21:27:54 +0000]
Use SubscriptionId instead of SubId

Use the renamed methods in ServiceStateTable which refer to
SubscriptionId instead of SubId.

Change-Id: Ic837535b431c19d952e065b742d678152afafd57
Fixes: 35766624
Test: Existing unit tests pass

2 years agofix simActivation test failure
fionaxu [Wed, 29 Mar 2017 00:27:42 +0000]
fix simActivation test failure

catcht the correct exception type IllegalArgumentException

Test:runtest --path
Change-Id: I1320182533b57831c4975fee4d0332ca2e083cb7
(cherry picked from commit 860f6ed5b6b1639460983449248b447d8bca418b)

2 years agoFixed roaming related issues
Jack Yu [Tue, 18 Apr 2017 07:58:20 +0000]
Fixed roaming related issues

1. the data enable check will be performed in trySetupData so
there is no need to add additional check in onRoamingOff and

2. Do not trigger set initial attach apn and set data profile
in onRoamingOn (revert this behavior back to N-MR2).

3. Renamed getDataOnRoamingEnabled to getDataRoamingEnabled
for consistency.

bug: 30936226, 37280015
Test: Telephony sanity tests

Change-Id: I30ce763468b3068ecd80ab2a6a313b6284016909

2 years agoMerge "Convert null string to """ into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 20:46:37 +0000]
Merge "Convert null string to """ into oc-dev

2 years agoMerge "stop polling service state when shutting down" into oc-dev
Chen Xu [Tue, 18 Apr 2017 17:26:35 +0000]
Merge "stop polling service state when shutting down" into oc-dev

2 years agoConvert null string to ""
Sooraj Sasindran [Thu, 13 Apr 2017 21:42:36 +0000]
Convert null string to ""

Convert null string to "" for call forward API

Test: verified that call fording can be disabled
Change-Id: I2ad7d3cd74765377d20936b34da177b17aedb231
(cherry picked from commit 01f650b0c580c22a42651e08bdd042c0d5b6c0fd)

2 years agoMerge "group multi-part message by 3gppswappush" into oc-dev
Chen Xu [Tue, 18 Apr 2017 01:05:01 +0000]
Merge "group multi-part message by 3gppswappush" into oc-dev

2 years agostop polling service state when shutting down
fionaxu [Wed, 12 Apr 2017 01:43:27 +0000]
stop polling service state when shutting down

if pollServiceState is modem triggered,  we will keep polling state even
radio is off. This will cause "No service" and "No SIM card" hangs here
for a while during the power off sequence.

Bug: 34359617
Test: Manual
Change-Id: I9a6f0412bdf7dd67316ce982834a7ad43054f7f4

2 years agoServiceStateTracker notifies via ContentProvider
Jordan Liu [Tue, 7 Mar 2017 23:51:23 +0000]
ServiceStateTracker notifies via ContentProvider

ServiceStateTracker inserts updated ServiceStates into the provider.
Telephony.ServiceStateTable contains helper functions and constants for
interfacing with the ServiceStateProvider.

Also update ContextFixture so the unit tests doesn't fail when trying to
use the service-state authority

Bug: 33756364
Test: runtest --path ServiceStateTrackerTest
Change-Id: I6b07b54f803765bba4c014474926a825113ac952
Merged-In: I6b07b54f803765bba4c014474926a825113ac952

2 years agoMerge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" into oc-dev
Meng Wang [Sat, 15 Apr 2017 17:10:48 +0000]
Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" into oc-dev

2 years agoMerge "Switch to using StringNetworkSpecifier." into oc-dev
TreeHugger Robot [Sat, 15 Apr 2017 02:16:10 +0000]
Merge "Switch to using StringNetworkSpecifier." into oc-dev

2 years agoMerge "Allow broadcast receivers to receive SMS_REJECTED_ACTION." into oc-dev
Amit Mahajan [Fri, 14 Apr 2017 17:54:42 +0000]
Merge "Allow broadcast receivers to receive SMS_REJECTED_ACTION." into oc-dev

2 years agoSwitch to using StringNetworkSpecifier.
Lorenzo Colitti [Tue, 31 May 2016 01:12:01 +0000]
Switch to using StringNetworkSpecifier.

Bug: 27533960
Test: unit tests
Change-Id: Ic763178bb1d85e9ec1734953415a416e3216fd40
Merged-In: I85c575d620970063a396af06d84080a2cceb4293
Merged-In: Ie59fbfc49b07496057973a3279d6b9ef5bb9d4bd

2 years agoChanged the naming scheme for Treble java libraries (both static and dynamic)
Andreas Huber [Thu, 13 Apr 2017 16:58:25 +0000]
Changed the naming scheme for Treble java libraries (both static and dynamic)

android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: Ic655ecd0390e09fb256b6f04b505335f35bc19e3
Merged-In: I42a6603d61327752212d5ed3b297293b301a9e00

2 years agoAllow broadcast receivers to receive SMS_REJECTED_ACTION.
Amit Mahajan [Thu, 13 Apr 2017 21:10:23 +0000]
Allow broadcast receivers to receive SMS_REJECTED_ACTION.

Allow apps in the background to receive SMS_REJECTED_ACTION as
that behavior is consistent with SMS_RECEIVED_ACTION. Both
intents should eventually be deprecated, but for now keeping
behavior same for both.

Test: Basic telephony sanity
Bug: 37156623
Change-Id: Iad19510998e1e88f8e09f2763fa98b7355af4dee

2 years agoECBM SystemProperty cleanup
Shuo Qian [Wed, 12 Apr 2017 22:11:25 +0000]
ECBM SystemProperty cleanup

- add a 'set' method in phone.java, and use it to set ECBM system property
  and mIsPhoneInEcmState variable
- use isInEcm() method in the phone.java to read mIsPhoneInEcmState

Change-Id: Ie3882d1e9285904a17def68993987ae0549941a7
Test: manual
Bug: 30361624

2 years agoMerge "Add p2 option in OpenLogicalChannel" into oc-dev
Amit Mahajan [Wed, 12 Apr 2017 22:02:34 +0000]
Merge "Add p2 option in OpenLogicalChannel" into oc-dev

Meng Wang [Tue, 11 Apr 2017 18:45:53 +0000]

During APPSTATE_SUBSCRIPTION_PERSO, we don't know if SIM locked or not
APPSTATE_SUBSCRIPTION_PERSO with other substate introduces uncessary SIM
state transition. It's OK to just keep the last SIM state (NOT_READY,for
example, the initial state during phone bootup).

Also fixed import.

Bug: 37240275
Test: make
Test: unlocked Verizon SIM bootup state sequence is: NOT_READY -> READY
      -> IMSI -> LOADED. UNKNOWN is gone.
Change-Id: I89d479a51c81fe25713f3694f640e2eead1888cd
(cherry-pick of https://android-review.googlesource.com/#/c/369890/)

2 years agoMerge "fix CTS failure for getNeighboringCellInfo" into oc-dev
Chen Xu [Wed, 12 Apr 2017 15:35:44 +0000]
Merge "fix CTS failure for getNeighboringCellInfo" into oc-dev

2 years agoAdd p2 option in OpenLogicalChannel
Ajay Nambi [Thu, 3 Dec 2015 21:20:05 +0000]
Add p2 option in OpenLogicalChannel

- Adding support for P2 parameter
- Needed to support OMAPI 3.0 defined
by SIM Alliance

Test: Basic telephony sanity
Bug: 27360148
Change-Id: I51ab0821f84dca8fff90c912ebbfc9f1129dcbe5

2 years agoMerge "Relax VVM originating number matching" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 00:09:49 +0000]
Merge "Relax VVM originating number matching" into oc-dev

2 years agogroup multi-part message by 3gppswappush
fionaxu [Sun, 2 Apr 2017 22:39:28 +0000]
group multi-part message by 3gppswappush

If a device only receives part of long SMS from the network,
and then at some time later received another WAP push with
the same msg_id & message_count, device should not try to
combine them as the same message, otherwise it will trigger
out of boundary crash since sequence numbers for concatenated
messages start at 1 and the exception is CDMA WAP PDU messages,
which use a 0-based index. Fix is trying to group long message
by message_count, message_id, address and 3gpp2wap.

Bug: 29773532
Test: runtest --path
Change-Id: I18d80f6bad2541e63211b9d61be63d17d817773d

2 years agoMerge "Merged makeNetworkCapabilities and getCopyNetworkCapabilities" into oc-dev
Jack Yu [Tue, 11 Apr 2017 17:33:01 +0000]
Merge "Merged makeNetworkCapabilities and getCopyNetworkCapabilities" into oc-dev

2 years agoRelax VVM originating number matching
Ta-wei Yen [Tue, 11 Apr 2017 01:06:17 +0000]
Relax VVM originating number matching

The visual voicemail client can restrict the originating number for
VVM SMS to reduce false positives. The matching criteria used to be
exact match, which is too strict. Especially on CTS tests where
the formatting of the number cannot be controlled.

In this CL PhoneNumberUtils.compare() is used instead, which will
ignore formatting and country codes.

Bug: 37106950
Test: CTS android.telephony.cts.VisualVoicemailServiceTest
Change-Id: I2d28a3718b1a87f8618d171d71a08809763b9715

2 years agofix CTS failure for getNeighboringCellInfo
fionaxu [Mon, 10 Apr 2017 22:39:44 +0000]
fix CTS failure for getNeighboringCellInfo

Some telephony APIs will hungs without sending result back
to the callers on Wifi-only devices. fix is returning the
asyncresult back to callers.

Test: run cts -c android.telephony.cts.CtsTelephonyTestCases
Change-Id: I729ad3c2e5a03c627d1261f4963887babca31fd7

2 years agoHold on data-stall recovery logic during voice call on other sub.
Sandeep Gutta [Tue, 7 Jun 2016 13:29:01 +0000]
Hold on data-stall recovery logic during voice call on other sub.

- Data stall may get falsely triggered if there is a voice call on
  other sub and data is dormant on current data subscription.
- As part of recovery, telephony may bring-down the PDP or even reset
  the modem.
- Do not proceed the data-stall logic if there is an active voice
  call on any of the subscriptions.

Merged-In: I135f012c549bf8a2a32d14de05b2d49b62eb4d1b
Change-Id: I135f012c549bf8a2a32d14de05b2d49b62eb4d1b
Bug: 34760370
Test: Manual

2 years agoMerge "Use internal namespace for STK intents." into oc-dev
TreeHugger Robot [Mon, 10 Apr 2017 00:05:46 +0000]
Merge "Use internal namespace for STK intents." into oc-dev

2 years agoMerge "remove deprecated API sendDialerCode" into oc-dev
Chen Xu [Fri, 7 Apr 2017 15:53:07 +0000]
Merge "remove deprecated API sendDialerCode" into oc-dev

2 years agoUse internal namespace for STK intents.
Amit Mahajan [Thu, 6 Apr 2017 16:30:24 +0000]
Use internal namespace for STK intents.

Test: none
Bug: 36976577
Change-Id: I3f59c061f075b4b6978960f79034478fe87d9916

2 years agoChange radio related service names to slot1, slot2, slot3...
Amit Mahajan [Tue, 28 Mar 2017 18:15:44 +0000]
Change radio related service names to slot1, slot2, slot3...

Test: Basic telephony sanity
Bug: 36570718
Merged-in: I425a78717fdd30d837ea7d8459192574afc75969
Change-Id: I425a78717fdd30d837ea7d8459192574afc75969

2 years agoMerge "Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED." into...
Sanket Padawe [Tue, 4 Apr 2017 01:11:53 +0000]
Merge "Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED." into oc-dev

2 years agoAdd new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.
Sanket Padawe [Mon, 3 Apr 2017 18:44:13 +0000]

Bug: 36572866
Test: manual
Change-Id: Ie41a6401a19118533cd857e2b72546ec26dc17df