Commit Graph

4327 Commits

Author SHA1 Message Date
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
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
Sooraj Sasindran
e9bcb328bd Merge "Rename ANAS to ANS" 2018-10-06 03:41:26 +00:00
Hall Liu
50600fcc61 Merge "Wire up the stopRtt API" am: 2d82493ded am: c7d6900e49
am: 41535c78be

Change-Id: Ia5e8888fbdff213167f031d221f301d5c4659cfc
2018-10-05 18:32:14 -07:00
Hall Liu
41535c78be Merge "Wire up the stopRtt API" am: 2d82493ded
am: c7d6900e49

Change-Id: I76eb7a9ac0c89b962241e4787a6306ad65e37792
2018-10-05 18:19:54 -07:00
Hall Liu
c7d6900e49 Merge "Wire up the stopRtt API"
am: 2d82493ded

Change-Id: I720ec95129c7da6b0fbd802522f6b85f54de2f7b
2018-10-05 18:08:28 -07:00
Hall Liu
2d82493ded Merge "Wire up the stopRtt API" 2018-10-06 00:49:14 +00:00
Pengquan Meng
4ddb43ddf1 Merge "Fix incorrect API comments of getSubId()" am: 66a0899785
am: 5a75425936

Change-Id: I85a566c0eb25c73237c31b1f89975ed898a4f829
2018-10-05 17:46:38 -07:00
Pengquan Meng
5a75425936 Merge "Fix incorrect API comments of getSubId()"
am: 66a0899785

Change-Id: Ia4f100021e33aac65208eb2ef4c15ca0f1b7d5c4
2018-10-05 17:35:11 -07:00
Pengquan Meng
66a0899785 Merge "Fix incorrect API comments of getSubId()" 2018-10-06 00:13:01 +00:00
Shuo Qian
bc905712fc Merge "Add Parcelable EmergencyNumber and APIs" am: 379ca95c89 am: e414f5ed16
am: ffdf4d26ec

Change-Id: I4106b0a3e519c2a89db29196edfe05a6a515125d
2018-10-05 16:22:13 -07:00
Shuo Qian
ffdf4d26ec Merge "Add Parcelable EmergencyNumber and APIs" am: 379ca95c89
am: e414f5ed16

Change-Id: Ic3f48cc3df90edde8c5ed1941a4e5a6f4e7ab572
2018-10-05 16:08:31 -07:00
Shuo Qian
e414f5ed16 Merge "Add Parcelable EmergencyNumber and APIs"
am: 379ca95c89

Change-Id: I03c07a695d03409e6be4f5a98f37d4191bdc5dd1
2018-10-05 15:51:38 -07:00
Shuo Qian
379ca95c89 Merge "Add Parcelable EmergencyNumber and APIs" 2018-10-05 22:29:36 +00:00
Pengquan Meng
4e2678d184 Fix incorrect API comments of getSubId()
getSubid() return the SubscriptionManager#getDefaultSubscriptionId()
when TelephonyManager created without the subId.

Bug: 111453847
Test: Build
Merged-In: I8e38ef43b5f23bbedc4d584df78c12f250b88fcc
Change-Id: I8e38ef43b5f23bbedc4d584df78c12f250b88fcc
2018-10-05 14:25:52 -07:00
Pengquan Meng
030a248749 Merge "Fix incorrect API comments of getSubId()" 2018-10-05 21:20:41 +00:00
Tyler Gunn
de3dd49761 Merge "Add finer grained call fail reasons." am: 5d0d0edc22 am: 46f1dfdf2d
am: 62077422bb

Change-Id: Iacefb95808a99bd3a9a2f59f3201e6d8b73498a5
2018-10-05 14:17:44 -07:00
Tyler Gunn
62077422bb Merge "Add finer grained call fail reasons." am: 5d0d0edc22
am: 46f1dfdf2d

Change-Id: Ifca132fd271c311937f60bb6501d9d1f6de796bd
2018-10-05 14:01:31 -07:00
Tyler Gunn
46f1dfdf2d Merge "Add finer grained call fail reasons."
am: 5d0d0edc22

Change-Id: I06cda0a862459e0c805039f7cc6f1b70337f40de
2018-10-05 13:49:31 -07:00
sqian
798da56c92 Make isUsableSubIdValue public
Rename subId to subscriptionId

Bug: 113072551
Test: Treehugger
Change-Id: I54303bab4d40d6168332d0263e9de1603205bb75
2018-10-05 13:47:53 -07:00
Tyler Gunn
5d0d0edc22 Merge "Add finer grained call fail reasons." 2018-10-05 20:35:55 +00:00
SongFerngWang
165d2d2f0c add four new carrier configs for supplementary service precautions.
The carrier configs control the supplementary service precautions for
call forwarding ,call barring ,caller id ,and call waiting .

Bug: 80404623
Test: Build pass

Change-Id: I5fbe9734dbb092b25fd145344c7559d2dee79df2
2018-10-06 00:39:37 +08:00