Commit Graph

6763 Commits

Author SHA1 Message Date
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
2c0e41694e Merge "Create URI for individual user settings in SIMINFO"
am: cb90628990

Change-Id: I335656c76eb878f5558853026f9403e258728056
2018-10-11 11:36:27 -07:00
Chen Xu
cb90628990 Merge "Create URI for individual user settings in SIMINFO" 2018-10-11 18:19:12 +00:00
Tor Norbye
f2183961a9 Merge "Fix incorrect javadoc links" am: 0d954557a1
am: cd1c75ae4c

Change-Id: I6d8c44be9d156ac2b6a20d3d13972371ee4d741e
2018-10-10 17:20:42 -07:00
Tor Norbye
cd1c75ae4c Merge "Fix incorrect javadoc links"
am: 0d954557a1

Change-Id: Id358aab44d8e77561a9b5cb27c363d2325a79086
2018-10-10 16:39:36 -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
Yangster
16e3399902 Merge "Phone service state change atom."
am: 419fc89b52

Change-Id: Iae02f9eee2616affb810c54f1af62693d29b5822
2018-10-10 15:24:17 -07: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
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
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
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
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
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
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
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
sqian
ff1dc37540 Add Parcelable EmergencyNumber and APIs
Test: unit test
Bug: 112657134
Change-Id: If926291e3f6fb6d2a3acd3d28d2ead85fbf01364
2018-10-04 17:07:57 -07:00
Cassie Han
5d82f62bdb Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" am: 56dedc8fe8
am: 086476e72e

Change-Id: I12868c85b5645b84097566a936d7692ddb6fdcb7
2018-10-04 14:01:08 -07:00
Cassie Han
086476e72e Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'"
am: 56dedc8fe8

Change-Id: I5be733e8edf4a07840b1d87ab295be606fbbadbb
2018-10-04 13:51:56 -07:00
Cassie Han
56dedc8fe8 Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" 2018-10-04 20:35:07 +00:00
Cassie
5d2b861509 Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'
Bug: 116363528
Test: Maunal test
Change-Id: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
Merged-In: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
2018-10-04 20:31:05 +00:00
Tyler Gunn
b2af2d531a Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." am: 440158df4f
am: ca239d77d6

Change-Id: I6edd5403d90b0a3f7779026480835175693a2228
2018-10-04 08:56:55 -07:00
Tyler Gunn
ca239d77d6 Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL."
am: 440158df4f

Change-Id: I73172c9f46aefe6382806ce30552a9498ebb7868
2018-10-04 08:39:53 -07:00
Tyler Gunn
440158df4f Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." 2018-10-04 15:21:51 +00:00