Commit Graph

2843 Commits

Author SHA1 Message Date
Malcolm Chen
5f153006b0 Merge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8 am: 4d2ffac581
am: c84d79740e

Change-Id: I2998277c63caa244aba07372ac8104aeeed85529
2018-01-09 21:10:15 +00:00
Malcolm Chen
c84d79740e Merge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8
am: 4d2ffac581

Change-Id: I349cd20ecbcb801a1e93d4a215d65df432f5df69
2018-01-09 19:43:02 +00:00
Treehugger Robot
289b3fbca8 Merge "Rename RadioNetworkConstants to NetworkConstants." 2018-01-09 07:04:01 +00:00
TreeHugger Robot
03057588bc Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()" 2018-01-09 02:03:01 +00:00
Jeff Sharkey
9c53dba9a3 Merge "Sigh, people wrote tests with weird assumptions." 2018-01-08 23:01:15 +00:00
Pankaj Kanwar
d3d0e82727 Merge "Change warning message for roaming for DTAG." 2018-01-08 22:02:18 +00:00
Cassie Han
658e7119a6 Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config." am: 9c1279d2ae
am: 28dd9dfeb5

Change-Id: I9b8a48709850b545b806fb605d1d94e9cdefe1d0
2018-01-08 21:28:02 +00:00
Jeff Sharkey
ddf216440d Sigh, people wrote tests with weird assumptions.
They're mocking a mock.  Nelson called.

Test: bit FrameworksTelephonyTests:com.android.internal.telephony.ServiceStateTrackerTest
Bug: 71707742
Change-Id: I30db29808fb22ade2247446782ee1ec3d4b947cb
2018-01-08 13:38:49 -07:00
Cassie Han
9c1279d2ae Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config." 2018-01-08 17:25:26 +00:00
Jiyong Park
15bf538cbe Remove SystemApi annotation from EuiccManager.getOtaStatus()
EuiccManager.getOtaStatus() has been annotated as @SystemApi, but its
declaring class EuiccManager has not. Therefore, the method hasn't been
recognized as SystemApi (does not appear in system-current.txt) and no
app is using the method.

This hasn't been harmful, but will soon trigger CTS failures when we do
the exact match for SystemAPIs; a runtime entity annotated as @SystemApi
have to exist in the documented API (e.g. system-current.txt). So
removing this no-op annotation.

Bug: 67891551
Test: m -j checkapi
Change-Id: I570ef5e5c88b6b9162116d3d3a7b17367efa9d7f
2018-01-08 14:08:17 +09:00
pkanwar
1e96faed34 Change warning message for roaming for DTAG.
Bug: 64106612
Test: manual
Change-Id: I9fee99d4f08521727466c2480dce0aff3a395fe3
2018-01-07 16:34:02 -08:00
Jeff Sharkey
717f52f2dd Intent to manage subscription plans.
Define an API for carrier apps to provide a deep-link into their app
for the user to see more details about their billing relationship,
such as upgrading plans.

The createManageSubscriptionIntent() method is ready for OS
components to use when deciding if they should show a "MANAGE"
button in their UI, and the returned Intent is fully constructed
and ready to roll.

Test: builds, boots
Bug: 64133169
Change-Id: I9b2775b7cba5313f517996870135eb4682082873
2018-01-04 16:11:51 -07:00
Cassie
661f63131b Migrate flag config_telephony_use_own_number_for_voicemail to Carrier
Config.

Bug: 65683508
Test: Basic telephony sanity
Change-Id: I74a24b60bfc0b527f7f0cb6d7084bb7b36aae6e5
2018-01-04 10:15:31 -08:00
Jake Wharton
695c53ee09 Correct Telephony source directory to match package.
Test: none
Bug: 71549250
Change-Id: I3e4c1d67240d83712f96d076d650af464a9c8277
2018-01-04 10:16:31 -05:00
Qingxi Li
dba6365966 Merge "Add API to get eUICC's OTA status" am: 15a410a75a
am: 412aecc2b0

Change-Id: I50ec4a84ddc30e5232bd0cabb8a721ebb7feca47
2018-01-04 02:09:32 +00:00
Malcolm Chen
51695b2647 Rename RadioNetworkConstants to NetworkConstants.
Rename RadioNetworkConstants to NetworkConstants and some classes
inside it.

Bug: 64132030
Test: Build
Change-Id: I5f3d2310e4f8e556aa32b00e6b6bbe6c4d709afb
2018-01-03 16:45:53 -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
Malcolm Chen
2bac68a635 Merge "Move Ims related settings from global setting to subscription db." am: f2ebbd1356
am: 5bf5c028f7

Change-Id: Iab3a7a47da5961471bce7a8e29960ab75e68719b
2018-01-03 20:04:37 +00:00
Treehugger Robot
f2ebbd1356 Merge "Move Ims related settings from global setting to subscription db." 2018-01-03 19:42:24 +00:00
Qingxi Li
acaee9645b Merge "Add API to get eUICC's OTA status" 2018-01-02 23:30:52 +00:00
sqian
448c1fd15a Merge "Add ICCID_PREFIX column in CarridId DB" am: 73200d9ac9
am: 33395ea925

Change-Id: Ied8bb4b9302533bc13ebcd49c80cdd1ca6c0641d
2017-12-28 22:23:48 +00:00
Treehugger Robot
73200d9ac9 Merge "Add ICCID_PREFIX column in CarridId DB" 2017-12-28 22:07:25 +00:00
Jack Yu
e8f6d7cc27 Merge "Added AIDL for cell identity" am: 470ba9d471
am: a205f42172

Change-Id: I82ea2e0019e513a3404e8bde0cda6514203df7dc
2017-12-28 18:35:32 +00:00
Treehugger Robot
470ba9d471 Merge "Added AIDL for cell identity" 2017-12-28 18:17:34 +00:00
Jack Yu
23192ff57f Added AIDL for cell identity
Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Merged-In: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
(cherry picked from commit 31db18a4c0)
2017-12-27 23:29:49 -08:00
Malcolm Chen
372da16813 Move Ims related settings from global setting to subscription db.
Bug: 66699661
Test: Manual

Change-Id: Id0d7795401f120b6a8704304a368d926a6610395
Merged-In: Id0d7795401f120b6a8704304a368d926a6610395
2017-12-28 01:03:23 +00:00
Jack Yu
31db18a4c0 Added AIDL for cell identity
Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
2017-12-27 16:19:20 -08:00
sqian
642a8d2d10 Add ICCID_PREFIX column in CarridId DB
Bug: 64131637
Test: Treehugger runs providers/telephony/CarrierIdProviderTest.java

Change-Id: I0d118ab181dfe17a7976a0b654989a3662594d4a
Merged-In: I0d118ab181dfe17a7976a0b654989a3662594d4a
(cherry picked from commit 4fe8280dc6)
2017-12-27 15:28:06 -08:00
goneil
663150a708 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" am: ee48176ad6
am: f220cdfca4

Change-Id: Ic809d19c8d5542b8f3a7d2a8b245a4db971165e3
2017-12-27 21:37:28 +00:00
Malcolm Chen
0eff354771 Merge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8
am: c7cebc8e8e

Change-Id: I50fdbebe3decd0dad93802fdf8fa722ab7c06d07
2017-12-27 21:24:37 +00:00
Treehugger Robot
ee48176ad6 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" 2017-12-27 21:22:02 +00:00
Malcolm Chen
ccc427426f Remove getIntWithSubId in TelephonyManager.
For multi-SIM case, getIntWithSubId would check if a Global.Settings
value doesn't exist for a specific SIM (for example mobile_data0),
it copies value from general one (mobile_data).

Test: Telephony unittests
Bug: 34351475
Change-Id: I870e6f3c193cf3bdeae22fe1a750b0a0ec782f9b
Merged-In: I870e6f3c193cf3bdeae22fe1a750b0a0ec782f9b
2017-12-23 00:45:35 +00:00
Qingxi Li
5405836497 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
2017-12-22 13:48:35 -08:00
Ying Xu
5f51741ae2 Merge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
am: 3fc3857a73

Change-Id: I90d8d01ecedfa7993852041a7da811899f71cb64
2017-12-22 01:26:53 +00:00
Ying Xu
3fc3857a73 Merge "Expose the scan API and network select API." am: 761b7b50d1
am: a9083c3145

Change-Id: Iee5e44b4f6a9a8921a89c05640be4d52e0251bb8
2017-12-22 01:17:05 +00:00
Hall Liu
aa9347980e Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0 am: 3424136a59
am: effcd1f508

Change-Id: Ibefdba1da5da4bfdf93d7db4c0f42a79ad75be46
2017-12-22 01:01:50 +00:00
Ying Xu
761b7b50d1 Merge "Expose the scan API and network select API." 2017-12-22 01:01:09 +00:00
Hall Liu
effcd1f508 Merge "Add feature flag and EMBMS bug fixes" am: 465f2916e0
am: 3424136a59

Change-Id: Iebc092e58752f32b6abfad612901ae094e083449
2017-12-22 00:54:14 +00:00
Hall Liu
465f2916e0 Merge "Add feature flag and EMBMS bug fixes" 2017-12-22 00:37:31 +00:00
Gil O'Neil
42995cfcce Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis" 2017-12-21 23:36:20 +00:00
TreeHugger Robot
9d51240f03 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" 2017-12-21 23:22:34 +00:00
goneil
d75e242fb8 Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions
Bug: 70177947
Test: None
Merged-In:If26ae0c69d3266c2639b61b3ed32df3f1cb2c36f
Change-Id: Ie08e56c9409c1fbbe24133b0981f5ab35f6a2f24
2017-12-21 12:55:41 -08:00
goneil
52f3d19c3b Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions
Bug: 70177947
Test: None
Change-Id: If26ae0c69d3266c2639b61b3ed32df3f1cb2c36f
2017-12-21 12:53:27 -08:00
abdalkader
e1a5469101 Merge "SMS over IMS APIs revision" am: 2bf7f03e63 am: f9eba1a18f
am: ca88d359c0

Change-Id: Iea7624e10230294505982f0373b97a2486d6996f
2017-12-21 20:10:03 +00:00
abdalkader
ca88d359c0 Merge "SMS over IMS APIs revision" am: 2bf7f03e63
am: f9eba1a18f

Change-Id: Ia7bdaeee0ca3942d72d9e92faa78a947fe1d4616
2017-12-21 19:40:25 +00:00
goneil
c57be8083e Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis
Also make the possible SIM_ACTIVATION_STATE parameters @SystemAPIs

Bug: 67750905
Test: TelephonyManagerTests#test{Voice/Data}ActivationState
Change-Id: Ib2c672db1e78afdbc25c4d36da478c3b88ffe232
2017-12-21 10:22:10 -08:00
abdalkader
2bf7f03e63 Merge "SMS over IMS APIs revision" 2017-12-21 18:12:07 +00:00
Brad Ebinger
b2a83cfcfc SMS over IMS APIs revision
- Move from being a feature to being a capability
- Move format to the constructor and make final
- Initial hooking up of APIs provided by platform for ims providers.
- Add constants for send status result
- Rename SmsListener callbacks.
- Split acknowledgeSms for sms and sms reports.
- Add reason for onSendSmsResult
Bug: 69846044

Test: None
Change-Id: I861664264a117d5483e392d4aabff59bfaf4373e
2017-12-20 17:18:50 -08:00
Holly Jiuyu Sun
4fc008f305 Merge "Use getter instead of member for IEuiccController stub." am: 6991266aa6 am: fe8ee59db5
am: 1f141b0b1a

Change-Id: Ia57a9c7d86b9004ae3c9e853be70a083d91eb76a
2017-12-20 03:14:26 +00:00
Holly Jiuyu Sun
1f141b0b1a Merge "Use getter instead of member for IEuiccController stub." am: 6991266aa6
am: fe8ee59db5

Change-Id: I96f4cca6ca0f1f75e2fd32123e6cc3d8769ce348
2017-12-20 03:06:37 +00:00