Commit Graph

2912 Commits

Author SHA1 Message Date
TreeHugger Robot
9543d6eb65 Merge changes from topic "sms_ready"
* changes:
  Unhide SMS over IMS APIs
  Add and trigger onReady API for SMS over IMS.
2018-01-25 12:11:34 +00:00
Jun Yin
c949502b95 Merge "Adds stripTrailingFs" am: 27bb333e14 am: a91491a3b8
am: 76e05493b4

Change-Id: Ie4c5994131a97b9acbe445abef3f4c6e73009732
2018-01-25 03:42:45 +00:00
Treehugger Robot
27bb333e14 Merge "Adds stripTrailingFs" 2018-01-25 02:44:26 +00:00
Nathan Harold
1e39ade047 Merge changes from topic "keepalive-on-cell"
* changes:
  Rework KeepalivePacketData for Compatibility with Cell
  Add Constants for NATT Keepalive to RILConstants
  Relocate KeepalivePacketData to frameworks/base
2018-01-25 00:48:43 +00:00
Holly Jiuyu Sun
047707c7aa Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 am: 596c22a84d
am: 07b212b788

Change-Id: I771845c9f07aa18946c0ab99fffd2a08d888e819
2018-01-24 23:37:16 +00:00
Mohamed Abdalkader
bddbd624ec Add and trigger onReady API for SMS over IMS.
Test: manual test that normal code path is fine since this code path is
not yet exercisable.
BUG=69846044
Change-Id: Icb15ca4aa6606fba641f6270dca5e0e06fc4466a
2018-01-24 15:07:24 -08:00
Tyler Gunn
c3f129c795 Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d am: f343e33dd5
am: e39de15109

Change-Id: I48b1c82a051342b6a4504290a6297aebc8a2bdfd
2018-01-24 22:38:52 +00:00
Holly Jiuyu Sun
ec44a402d2 Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" 2018-01-24 21:11:07 +00:00
Jun Yin
b40a26c43d Adds stripTrailingFs
This function removes padding 'F' characters in a string (e.g., ICCID).

Bug: 38206971
Test: unit test in another cl
Change-Id: If77604576c5bd26404cdc436f8297191664325a4
2018-01-24 12:33:05 -08:00
Treehugger Robot
7a481bde6d Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." 2018-01-24 19:33:33 +00:00
Nathan Harold
974aada047 Add Constants for NATT Keepalive to RILConstants
Bug: 38350389
Test: compilation
Change-Id: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
2018-01-24 10:26:04 -08:00
Holly Jiuyu Sun
0ee6dfee1a Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
This reverts commit 5c9dcc0e72.

Reason for revert: The original failure was not caused by this CL and this CL does not depend on the broken one.

Change-Id: Ia60e21f634d8f307f1cf5a3992cb38de04c5f443
2018-01-24 17:57:39 +00:00
Nicolas Geoffray
1f568c14ac Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 2018-01-24 10:44:10 +00:00
Neil Fuller
4cfc02a316 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.
2018-01-24 10:07:48 +00:00
Holly Jiuyu Sun
d201c4dd51 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 am: 5598f5ab23
am: 687a28d77d

Change-Id: I56abcc7731ca08ed67a5123f826bfbc9ca4f74d0
2018-01-24 09:42:42 +00:00
Nicolas Geoffray
5c9dcc0e72 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.

Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
2018-01-24 09:11:40 +00:00
Holly Jiuyu Sun
48c6e980f5 Merge "Add cardId in EuiccCardManager API." am: a85291bfcf am: 50b8d3ef75
am: 9d5d23b69a

Change-Id: Ie922ef52b4fb5b6ee95bb5976b16d5f54d9b43a1
2018-01-24 05:39:57 +00:00
Holly Jiuyu Sun
8fd5b7e1c3 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." 2018-01-24 05:08:19 +00:00
Holly Jiuyu Sun
c2779f56fb Add cardId in EuiccCardManager API.
Removed getEid() API.

Bug: 38206971
Test: test on phone
Change-Id: I7e484f889a780900acd3a05a96fbbc632e1ec682
2018-01-23 17:11:30 -08:00
Holly Jiuyu Sun
2f87d7b2ee Add getUiccSlots() and switchSlots() in TelephonyManager.
Bug: 71914112
Test: test on phone
Change-Id: Ib7e9e40e5ecda48bdcd1f332dc7d6c422c08d942
2018-01-23 15:26:34 -08:00
Treehugger Robot
0fc9900802 Merge "Added new SIM state related broadcasts." 2018-01-19 04:25:12 +00:00
TreeHugger Robot
1ebcf6101d Merge "Added new SIM state related broadcasts." 2018-01-19 02:32:46 +00:00
Mohamed Abdalkader
c5cc226f9e Merge "Move Sms API to proper MMTelFeature class" 2018-01-18 22:51:27 +00:00
Amit Mahajan
5d70fc9ae3 Added new SIM state related broadcasts.
Test: Basic telephony sanity and unit tests
Bug: 64131518
Merged-in: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
Change-Id: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
2018-01-18 14:44:07 -08:00
Amit Mahajan
052e1e2941 Added new SIM state related broadcasts.
Test: Basic telephony sanity and unit tests
Bug: 64131518
Change-Id: Ie3d157e79a7040c161b9038c875a4a4f49d535ff
2018-01-18 14:38:21 -08:00
Holly Jiuyu Sun
5736685560 Merge "Add APIs to EuiccCardManager." am: a5bc474e2c am: f07319a6df
am: beacd5e4fa

Change-Id: I7aa42d89c69911137a86b86ee59463efe46a81c3
2018-01-18 04:28:28 +00:00
Holly Jiuyu Sun
bbc858006f Add APIs to EuiccCardManager.
The CL contains parts of the EuiccCard APIs. getEid() is sync. All the
other APIs are async.
Move ResetOptions from EuiccCard to EuiccCardManager.
The other APIs will be added in a follow-up CL.

Bug: 38206971
Test: test on phone
Change-Id: Iba098ee779b8ea4e244e0e4cf7318139666cc94b
2018-01-17 16:38:42 -08:00
Holly Jiuyu Sun
d53734184a Merge "Add APIs to EuiccCardManager and EuiccCardController." am: 0797f4be58 am: f09db036e5
am: 56a8d9ad4f

Change-Id: I02779540eaaf2ad934f5190c88296547c430df1a
2018-01-17 23:36:27 +00:00
Holly Jiuyu Sun
0797f4be58 Merge "Add APIs to EuiccCardManager and EuiccCardController." 2018-01-17 22:26:58 +00:00
Mohamed Abdalkader
8d7b060b40 Move Sms API to proper MMTelFeature class
- while here remove unnecessary call to ackSms from
  SmsImplBase as this is handled by ImsSmsDispatcher

Test: None, APIs not exercised yet.
BUG=69846044
Change-Id: Iec4bbd07a67502dbbfb2142a7bc95f51be0cb377
2018-01-17 13:52:04 -08:00
Brad Ebinger
1f00565433 Merge "Integrate IMS Registration API" 2018-01-17 20:29:54 +00:00
Holly Jiuyu Sun
fb1c78405e Add APIs to EuiccCardManager and EuiccCardController.
Move CancelReason from EuiccCard to EuiccCardManager.
part 2.

Bug: 38206971
Test: test on phone
Change-Id: Iab61be59b7130a5336dffbc965eefefcfa3eccf6
2018-01-17 10:38:15 -08:00
fionaxu
f4a7659967 new carrier id APIs
1. New telephony APIs to getCurrentCarrierId
and getCurrentCarrierName
2. New broadcast intent to notify carrier id changed

Bug: 64131637
Test: Build
Change-Id: I9a240ba7df313ad701f98bb3982f29c3d5317da8
(cherry picked from commit fff6f59a63)
Merged-in: I9a240ba7df313ad701f98bb3982f29c3d5317da8
2018-01-17 17:08:08 +00:00
Pankaj Kanwar
03863ba526 Merge "Address IMSI privacy issues." 2018-01-16 20:57:07 +00:00
Brad Ebinger
f0bc082a2c Integrate IMS Registration API
Integrates the new IMS Registration API into the framework
and add two APIs for feature parity.

1) Moves ImsRegistrationImplBase to the android.telephony.ims
namespace
2) Expose ImsRegistration AIDL in TelephonyManager as hidden
API.
3) Adds onVoicemailCountUpdate and
onSubscriberAssociatedUriChanged APIs for feature parity.

Bug: 63987047
Test: Telephony unit tests, manual IMS tests
Merged-In: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
Change-Id: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
2018-01-16 09:43:47 -08:00
Brad Ebinger
cc90cf002b Merge "Integrate IMS Registration API" 2018-01-16 17:30:54 +00:00
Brad Ebinger
1fb6121035 Integrate IMS Registration API
Integrates the new IMS Registration API into the framework
and add two APIs for feature parity.

1) Moves ImsRegistrationImplBase to the android.telephony.ims
namespace
2) Expose ImsRegistration AIDL in TelephonyManager as hidden
API.
3) Adds onVoicemailCountUpdate and
onSubscriberAssociatedUriChanged APIs for feature parity.

Bug: 63987047
Test: Telephony unit tests, manual IMS tests
Change-Id: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
2018-01-15 14:44:44 -08:00
pkanwar
af9eafbb8a Address IMSI privacy issues.
Added method resetCarrierKeysForImsiEncryption
to allow for keys to be reset.

Bug: 35606429
Test: manual
Change-Id: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
2018-01-15 11:06:34 -08:00
zxuan
788df35b06 Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state." am: 895148087b am: 5cea30c4ec
am: 78d54b01df

Change-Id: I798433851c10c7dc252d8773e6bbf1d3608ce66d
2018-01-13 07:06:17 +00:00
Treehugger Robot
895148087b Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state." 2018-01-13 04:09:42 +00:00
Hall Liu
4ba6ba6cb2 Merge "Use proper classloader when reading from parcel" am: d3cb6380a4 am: 03a515aed4
am: ff63c83237

Change-Id: If91f694b4f9c396e118dcf47ebaa480ff4cd44d0
2018-01-12 23:11:03 +00:00
Hall Liu
d3cb6380a4 Merge "Use proper classloader when reading from parcel" 2018-01-12 20:56:36 +00:00
Tyler Gunn
f780837575 Add new IMS reasoninfo to handle alternate emergency disconnect scenario.
Adding new ImsReasonInfo and corresponding DisconnectCause code.

Test: Manual, added unit test for code remapping.
Bug: 69024173
Change-Id: I30da4f2493fe19fe04365b9067c7feeb90a917a3
2018-01-12 08:24:21 -08:00
Hall Liu
aaf4b47e34 Use proper classloader when reading from parcel
Use the proper classloader when loading ImsStreamMediaProfile from a
parcel.

Bug: 71873453
Test: manual
Change-Id: Idf60f18b5d25b4c8eae225cb92a5391303c86d3b
2018-01-11 17:23:40 -08:00
Holly Jiuyu Sun
3d6b53c075 Add EuiccCardManager and EuiccCardController.
EuiccCardManager is in the same path with EuiccManager.
EuiccCardController is in the same path with EuiccController.
Use getAllProfiles() as an example interface.
The implementation of EuiccCard and its content will be added in a
follow up CL.
The new API is marked as @hide and TODO for @SystemApi.

Bug: 38206971
Test: test on phone
Change-Id: I153937c0f79bdd1a00b06b234a6e254a3f43072c
Merged-In: I153937c0f79bdd1a00b06b234a6e254a3f43072c
2018-01-11 10:30:43 -08:00
Holly Jiuyu Sun
5c11024d13 Add EuiccCardManager and EuiccCardController.
EuiccCardManager is in the same path with EuiccManager.
EuiccCardController is in the same path with EuiccController.
Use getAllProfiles() as an example interface.
The implementation of EuiccCard and its content will be added in a
follow up CL.
The new API is marked as @hide and TODO for @SystemApi.

Bug: 38206971
Test: test on phone
Change-Id: I153937c0f79bdd1a00b06b234a6e254a3f43072c
2018-01-10 18:59:50 -08:00
zxuan
35a4702443 Add the user mobile data state into PhoneStateListener
so that applications can listen to the change of
the user mobile data state.

Bug: 65290481
Test: builds
Change-Id: Id13cbe3242bf5f7aff565a3ebfe05056b6cd6e85
2018-01-08 19:44:21 -08:00
Malcolm Chen
ffbaa9de1c Add isMobileDataEnabled in TelephonyManager.
Added a new hidden API isMobileDataEnabled in TelephonyManager.
Rename related APIs to isUserMobileDataEnabled,
isUserMobileDataEnabled and setUserMobileDataEnabled to better
clarify their functionality.

Bug: 69814555
Test: build
Change-Id: I2f186f1e7550cafbe4ee3a5af293c39274cbfeaa
Merged-In: I2f186f1e7550cafbe4ee3a5af293c39274cbfeaa
2018-01-08 18:08:22 -08:00
Qingxi Li
cc6ad8cab7 Add API to get eUICC's OTA status
The function will return current eUICC's OTA status and requests calling
app has WRITE_EMBEDDED_SUBSCRIPTIONS.

Test: E2E
Bug: 37279356
Change-Id: I823ed7aa9d86530c4bebd4c0b1a00f0c607105ed
2018-01-03 12:42:01 -08:00
Qingxi Li
acaee9645b Merge "Add API to get eUICC's OTA status" 2018-01-02 23:30:52 +00:00