Commit Graph

4349 Commits

Author SHA1 Message Date
chen xu
e2592af979 Telephony light grey list clean up for Q
Bug: 112477300
Test: Telehony unit test
Change-Id: I5229224fe9a65b3647a42070f287e23f67084bda
2018-10-15 18:47:20 +00:00
Chen Xu
2a670634e3 Merge "refactor data/voice roaming states" am: 6bd29ab2df am: 652ec06948
am: 6169b04385

Change-Id: I921e3dd8f4c82d83d1f12657813945fbcc2e21b2
2018-10-12 11:57:14 -07:00
Chen Xu
6169b04385 Merge "refactor data/voice roaming states" am: 6bd29ab2df
am: 652ec06948

Change-Id: I1f82195e5477401f3216db92bbdac388bbe16c7f
2018-10-12 11:32:19 -07:00
Chen Xu
6bd29ab2df Merge "refactor data/voice roaming states" 2018-10-12 18:02:17 +00:00
Nan Zhang
ccc360e236 Merge "Fix incorrect javadoc link" am: 293ab4941b am: d96fe8ddd0
am: ae15939492

Change-Id: I7eb88ae0987e164542acc988cd031f1da4afd376
2018-10-11 23:33:24 -07:00
Nan Zhang
ae15939492 Merge "Fix incorrect javadoc link" am: 293ab4941b
am: d96fe8ddd0

Change-Id: I0331d98eb989ee429eb0ef38c448eae551130118
2018-10-11 23:16:13 -07:00
Treehugger Robot
293ab4941b Merge "Fix incorrect javadoc link" 2018-10-12 04:26:49 +00:00
Nan Zhang
6c288efb4d Fix incorrect javadoc link
Test: m -j docs with -lerror enabled for frameworks/base docs.
Bug: b/116163454
Change-Id: I02a164b676397dd2d9e8a52ae344c1033b1a4029
2018-10-11 16:44:28 -07:00
Sooraj Sasindran
e3630c858a Merge "Introduce AlternativeNetwork APIs" am: 98966bcbb6
am: 10211c1f68

Change-Id: Idb3a45b52567451df01afef5e4131a6426b487dc
2018-10-11 16:28:54 -07:00
Sooraj Sasindran
98966bcbb6 Merge "Introduce AlternativeNetwork APIs" 2018-10-11 22:58:32 +00:00
chen xu
0281169e6d refactor data/voice roaming states
1. migrate set/get roamingType from ServiceState to
NetworkRegState.set/get roamingType
2. migrate set/get roamingStateFromRegstate from ServiceState
to NetworkRegState.regState
3. new System API for neworkRegistration.isRoaming().

Bug: 116127096
Test: ServiceStateTest, ServiceStateProviderTest

Change-Id: Ib89744089c98713819c8d313240d629ddb77d0bf
2018-10-11 15:10:32 -07:00
Jordan Liu
524d6685a0 Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa am: ca854cc2b9
am: c3f2df9d6b

Change-Id: I66da4d1ff190243205f89c2d4e08b4506df4a40d
2018-10-11 14:31:15 -07:00
Jordan Liu
c3f2df9d6b Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa
am: ca854cc2b9

Change-Id: I6774ef18f185f35344bef3bf42ab5addf23ea03a
2018-10-11 14:12:55 -07:00
Treehugger Robot
bb9f855faa Merge "getTelephonyProperty returns defaultVal" 2018-10-11 20:30:17 +00:00
Chen Xu
0036c05f6c Merge "Create URI for individual user settings in SIMINFO" am: cb90628990 am: 2c0e41694e
am: 809d60067d

Change-Id: Iaed8ed35d1ff37362d54d8fa4f60d59f647b7003
2018-10-11 11:58:05 -07:00
Chen Xu
809d60067d Merge "Create URI for individual user settings in SIMINFO" am: cb90628990
am: 2c0e41694e

Change-Id: I2108c6a70ed49b74754de445e9b3f89a5ee083e0
2018-10-11 11:46:29 -07:00
Chen Xu
cb90628990 Merge "Create URI for individual user settings in SIMINFO" 2018-10-11 18:19:12 +00:00
Sooraj Sasindran
32e446bf00 Introduce AlternativeNetwork APIs
Introduce AlternativeNetwork APIs

Bug: 113106744
Test: Verified using test app to make api calls
Change-Id: I134d1aef40f014378fd1364e0bfec6926fe2093e
Merged-In: I7f470cd6028a12cc66a660d58720f803271d38eb
2018-10-11 16:45:08 +00:00
Yueming Wang
b07027fb20 Merge "Revert to previous constant value for ApnSetting.TYPE_DEFAULT." 2018-10-11 12:38:40 +00:00
Tor Norbye
757cc2cded Merge "Fix incorrect javadoc links" am: 0d954557a1 am: cd1c75ae4c
am: f2183961a9

Change-Id: Icf157b65308e7de18b51aec837b8c29baa5a1918
2018-10-10 23:22:18 -07:00
Yangster
1db2e8e4b4 Merge "Phone service state change atom." am: 419fc89b52 am: 16e3399902
am: 8f842fae06

Change-Id: Ibc518a29d8a31b3001aa6569ee370c45ce302f7c
2018-10-10 22:06:25 -07:00
Tor Norbye
f2183961a9 Merge "Fix incorrect javadoc links" am: 0d954557a1
am: cd1c75ae4c

Change-Id: I6d8c44be9d156ac2b6a20d3d13972371ee4d741e
2018-10-10 17:20:42 -07:00
Treehugger Robot
0d954557a1 Merge "Fix incorrect javadoc links" 2018-10-10 23:23:53 +00:00
Yangster
8f842fae06 Merge "Phone service state change atom." am: 419fc89b52
am: 16e3399902

Change-Id: Ifbff53d3b113c527975b5509289600f734dcca7b
2018-10-10 15:53:35 -07:00
Malcolm Chen
1936b89914 Add @NonNull in SubMgr#getOpportunisticSubscriptions return value.
Bug: 116117273
Test: build
Change-Id: I1b831ea7fc1eff78c262ae6f3b6ee91a72e1f5a9
2018-10-10 20:20:02 +00:00
Treehugger Robot
419fc89b52 Merge "Phone service state change atom." 2018-10-10 19:51:36 +00:00
Yangster
4ccebeadc7 Phone service state change atom.
Background: BatteryStatsService tracks the phone scanning time metric. In Q,
we are migrating the dumpsys-based collection to the new infra. This CL is to
instrument the new logging mechanism.

Test: statsd test
FIX: b/116748990

Change-Id: I3cf5e0026bfc6f594c5f7b524f14b3a43b702afb
2018-10-10 19:45:10 +00:00
Michael Groover
a28ad42768 Merge "Protect Device Identifiers behind priv permission and DO/PO checks" 2018-10-10 18:05:23 +00:00
Xiangyu/Malcolm Chen
b4e0645657 Merge "Add VisibleForTesting to create TelephonyRegistryTest." am: fb96aac216
am: e7af7977cf

Change-Id: I8b1ad47627836972dc96230da040d8996c543d59
2018-10-09 18:14:08 -07:00
Treehugger Robot
b7b19312f0 Merge "Fixed the indentation" 2018-10-10 01:05:26 +00:00
TreeHugger Robot
c4cfbf48c2 Merge "Revert "Make SubscriptionManager.getSlotIndex public"" 2018-10-10 01:01:56 +00:00
Xiangyu/Malcolm Chen
e7af7977cf Merge "Add VisibleForTesting to create TelephonyRegistryTest."
am: fb96aac216

Change-Id: Ib18e4d3a2caf16f5523ec7413e892cdce18e6a06
2018-10-09 18:00:03 -07:00
Jack Yu
84897e23fb Fixed the indentation
Test: Build
Change-Id: Id8a30734c1e4607b0396e0a985ab46502d8723b9
2018-10-09 16:24:23 -07:00
Malcolm Chen
800a7d6dbf Add VisibleForTesting to create TelephonyRegistryTest.
Bug: 113305153
Test: unittest
Change-Id: Ie59b2da76fbc813ce011d4d0ab3ff533a6006e14
Merged-In: Ie59b2da76fbc813ce011d4d0ab3ff533a6006e14
2018-10-09 14:50:20 -07:00
Michael Groover
6d20d75e9e Protect Device Identifiers behind priv permission and DO/PO checks
Bug: 110099294
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases \
      -t com.android.cts.devicepolicy.DeviceOwnerTest.testDeviceOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases \
      -t com.android.cts.devicepolicy.ManagedProfileTest#testGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest
Test: cts-tradefed run cts -m CtsPermissionTestCases -t android.permission.cts.TelephonyManagerPermissionTest

Change-Id: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2018-10-09 13:44:02 -07:00
Xiangyu/Malcolm Chen
4b61b0bdf1 Merge "More descriptions on SubscriptionController#setPreferredData" am: 16fcd3dcff
am: 247f18f47a

Change-Id: Id25f73dc5a0bd91c78f3822d31a6b37f7b488d5c
2018-10-09 11:54:25 -07:00
Xiangyu/Malcolm Chen
247f18f47a Merge "More descriptions on SubscriptionController#setPreferredData"
am: 16fcd3dcff

Change-Id: I33f2ee636be99c3cfba706dc581415881b5f11c3
2018-10-09 11:40:35 -07:00
Xiangyu/Malcolm Chen
16fcd3dcff Merge "More descriptions on SubscriptionController#setPreferredData" 2018-10-09 18:18:11 +00:00
Malcolm Chen
8cf1b78693 More descriptions on SubscriptionController#setPreferredData
Bug: 115550764
Test: build
Change-Id: I25c3f89a3c3f8e8e6475221885d995bcb5684da4
Merged-In: I25c3f89a3c3f8e8e6475221885d995bcb5684da4
2018-10-08 20:09:09 -07:00
Pengquan Meng
42626ec198 Add isManualNetworkSelectionAllowed api to telephonyManager
am: 23a405c016

Change-Id: I06a89be0139ba83962e7295d0078f2909071e8f5
2018-10-08 16:22:20 -07:00
Pengquan Meng
cc03b9b8f9 Merge "Add isManualNetworkSelectionAllowed api to telephonyManager"
am: 0af8c5c73c

Change-Id: Ib4eeafabe49c785143cbfc48eabd039f535e11a5
2018-10-08 16:08:26 -07:00
Pengquan Meng
0af8c5c73c Merge "Add isManualNetworkSelectionAllowed api to telephonyManager" 2018-10-08 22:16:52 +00:00
Shuo Qian
918bc902ce Merge "Make isUsableSubIdValue public" am: 37064062bb am: 481f02cc65
am: eafd95f787

Change-Id: I63e9e0cf7e08faad38c81b13a19201d5283f284d
2018-10-08 14:46:22 -07:00
Shuo Qian
eafd95f787 Merge "Make isUsableSubIdValue public" am: 37064062bb
am: 481f02cc65

Change-Id: Idf0af2491d8a90c052e5dddbfba5da7c9059b544
2018-10-08 14:19:14 -07:00
chen xu
a0007490e7 Create URI for individual user settings in SIMINFO
Bug: 112700925
Test: TelephonyProviderTest#testUpdateWfcEnabled
Change-Id: I85639c50c2b3abb27b9a87823726d080a817ed6f
2018-10-08 14:15:08 -07:00
Shuo Qian
481f02cc65 Merge "Make isUsableSubIdValue public"
am: 37064062bb

Change-Id: I5b5bdd8ab047edfa82e0c04e48fc3ec16e3317b0
2018-10-08 14:06:55 -07:00
Shuo Qian
37064062bb Merge "Make isUsableSubIdValue public" 2018-10-08 20:42:00 +00:00
Tor Norbye
f8dc2d204c Fix incorrect javadoc links
Test: make offline-sdk-docs
Bug: b/116163454
Change-Id: I55de1f71d443713b033ee63fd191bd34b3a52fd2
2018-10-08 19:58:17 +00:00
Pengquan Meng
23a405c016 Add isManualNetworkSelectionAllowed api to telephonyManager
Bug: 111453847
Test: build
Merged-In: Icdd60ab03fee4b2e7a08dda3c5c127a19ecac7ce
Change-Id: Icdd60ab03fee4b2e7a08dda3c5c127a19ecac7ce
2018-10-08 19:08:47 +00:00
SongFerng Wang
e42a94ea3e Merge "add four new carrier configs for supplementary service precautions." 2018-10-08 06:28:43 +00:00