Brad Ebinger
d2b1925d5f
Merge "Make ImsException final" am: cdc0da732d am: ec6bf56d64
...
am: 89a9462bfa
Change-Id: I71956dd999c8ec4be67bb6d58e1a1c3101e7c2b8
2019-03-20 13:53:13 -07:00
Brad Ebinger
89a9462bfa
Merge "Make ImsException final" am: cdc0da732d
...
am: ec6bf56d64
Change-Id: I21066c2da0f05fdb0fd7b34744d173ab9a63a43d
2019-03-20 13:39:29 -07:00
Brad Ebinger
ec6bf56d64
Merge "Make ImsException final"
...
am: cdc0da732d
Change-Id: Ic2aafb555b69398852409fc80f6ace5f0f92d1dc
2019-03-20 13:29:07 -07:00
Brad Ebinger
cdc0da732d
Merge "Make ImsException final"
2019-03-20 20:10:32 +00:00
Pengquan Meng
a70d308d65
Merge "[API feedback] fixed API for NR" am: 7afba9e583
...
am: ffddf67508
Change-Id: Ic3d7bf6773c61b8f738164e6a41ea616dd0286ac
2019-03-20 11:52:27 -07:00
Pengquan Meng
ffddf67508
Merge "[API feedback] fixed API for NR"
...
am: 7afba9e583
Change-Id: I703b745d276171f57092668d502441d45ae6ded6
2019-03-20 11:42:00 -07:00
Pengquan Meng
546c24ccb6
[API feedback] fixed API for NR
...
This CL included the follow change:
1. Change getPreferredNetworkTypeBitmap to
getPreferredNetworkTypeBitmask [b/126552419]
2. Change setPreferredNetworkTypeBitmap to
setPreferredNetworkTypeBitmask [b/126552419]
3. Add @IntRange annonation to CellIdentityNr.getNrarfcn() [b/126552419]
4. In javadoc, explain the acronym NR to say: (New Radio 5G)
[b/126552559]
5. Mark CellInfoNr.getCellSignalStrength and CellInfoNr.getCellIdentity
as @NonNull [b/126699572]
6. Mark CellIdentityNr.getMncString() and CellIdentityNr.getMccString()
as @Nullable [b/126702744]
Bug: 126552419
Bug: 126552559
Bug: 126699572
Bug: 126702744
Test: build
Merged-In: I133075a3688c3fa7550c8a2f43bc13d8b25999b2
Change-Id: I133075a3688c3fa7550c8a2f43bc13d8b25999b2
2019-03-20 11:19:21 -07:00
Chen Xu
5cf7557e3f
Merge "improve mism support for phonestatelistner" am: ed4d220c97
...
am: a05023c222
Change-Id: Icaade79b765a2c27bcf203f40a095b50d2087763
2019-03-20 11:12:32 -07:00
Chen Xu
a05023c222
Merge "improve mism support for phonestatelistner"
...
am: ed4d220c97
Change-Id: If09726fbd0bf82fdbe2da884d97d9b78089eb1ac
2019-03-20 10:55:57 -07:00
chen xu
2506ceb71e
improve mism support for phonestatelistner
...
1. throw exception if reuse the same listner for different sub
2. subId should come from TM instance not phonestateListener.
3. refactor settings to apply phonestatelistner with TM instances
Bug: 117555407
Test: Manual
Change-Id: I1af07798d7982575cccc27462af179182c033409
(cherry picked from commit 0ebc9b67e9 )
Merged-in: I1af07798d7982575cccc27462af179182c033409
2019-03-20 09:39:06 -07:00
Jack Yu
dc025370cd
Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba
...
am: 55e73c27a8
Change-Id: I84a8dcfbfad1e9d2b8b342f1f4cce9d8c9a4c69d
2019-03-20 00:03:39 -07:00
Jack Yu
55e73c27a8
Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
...
am: 936c536bba
Change-Id: I8142e09fbee353c95a4b429e8d1bc7365aa5863e
2019-03-19 23:42:34 -07:00
Xiangyu/Malcolm Chen
588663fb09
Merge "Better description and parameter name of setPreferredDataSubscriptionId"
2019-03-20 06:41:26 +00:00
Jack Yu
936c536bba
Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo"
2019-03-20 06:30:53 +00:00
Chen Xu
afe043d681
Merge "improve mism support for phonestatelistner"
2019-03-20 04:21:15 +00:00
Cody Kesting
c163113c6d
Merge "Add class comment to avoid extending ServiceState class." am: f0a67227c4 am: 0b0d934919
...
am: 2315621839
Change-Id: Ifdf2427161abde18695ee9575032af3db9ca308e
2019-03-19 17:20:40 -07:00
Cody Kesting
2315621839
Merge "Add class comment to avoid extending ServiceState class." am: f0a67227c4
...
am: 0b0d934919
Change-Id: Ifb20705f8e58acf35af7ce9c665e8f006c48c889
2019-03-19 17:11:08 -07:00
Cody Kesting
0b0d934919
Merge "Add class comment to avoid extending ServiceState class."
...
am: f0a67227c4
Change-Id: Ie643f2f1292df7491c9d800127e0c81bc70fc605
2019-03-19 16:52:15 -07:00
Cody Kesting
f0a67227c4
Merge "Add class comment to avoid extending ServiceState class."
2019-03-19 23:33:40 +00:00
chen xu
0ebc9b67e9
improve mism support for phonestatelistner
...
1. throw exception if reuse the same listner for different sub
2. subId should come from TM instance not phonestateListener.
3. refactor settings to apply phonestatelistner with TM instances
Bug: 117555407
Test: Manual
Change-Id: I1af07798d7982575cccc27462af179182c033409
2019-03-19 14:55:06 -07:00
Brad Ebinger
264915fd18
Make ImsException final
...
Bug: 128902253
Test: atest FrameworksTelephonyTests
Change-Id: I88058f8382978163718de8194249fad87ae52d10
2019-03-19 14:48:37 -07:00
Malcolm Chen
7a7e06d968
Better description and parameter name of setPreferredDataSubscriptionId
...
Bug: 128455935 128456058
Test: build
Change-Id: I41ae6752756d998739fd7635bcc7765f255806d7
2019-03-19 14:04:01 -07:00
Xiangyu/Malcolm Chen
2fa9c1c238
Merge "Remove SubscriptionManager#setMetered API."
2019-03-19 20:32:34 +00:00
Jack Yu
21d24541f0
Merge "API review feedback changes"
2019-03-19 17:08:54 +00:00
Tyler Gunn
949012715d
Merge "Extend light-greylist of some TelephonyManager APIs until Q." am: 0bb3c6bb93 am: 572f0ca7e4
...
am: 1abcf7d70e
Change-Id: I9b738c3efea61704b4d892219cf175466676859e
2019-03-19 08:44:53 -07:00
Tyler Gunn
1abcf7d70e
Merge "Extend light-greylist of some TelephonyManager APIs until Q." am: 0bb3c6bb93
...
am: 572f0ca7e4
Change-Id: Ib95672647d84f74f2fe24b8adac7a5ac30554c0c
2019-03-19 08:35:13 -07:00
Tyler Gunn
572f0ca7e4
Merge "Extend light-greylist of some TelephonyManager APIs until Q."
...
am: 0bb3c6bb93
Change-Id: I98739ce5d5210437df0618d14a6923ce92bccf03
2019-03-19 08:26:43 -07:00
Tyler Gunn
0bb3c6bb93
Merge "Extend light-greylist of some TelephonyManager APIs until Q."
2019-03-19 15:17:16 +00:00
Paul Hu
7ccfdd170e
Merge "Revert "Rename some failed causes"" am: e3cc2e6c98 am: 90e2f900ca
...
am: 778f372e23
Change-Id: I82c8bfb9a5f08d7ca205b2f18282f5346709b2e0
2019-03-19 08:05:53 -07:00
Paul Hu
778f372e23
Merge "Revert "Rename some failed causes"" am: e3cc2e6c98
...
am: 90e2f900ca
Change-Id: I1b951e3b00983a364b4eef8edb6e5c1d032a3b43
2019-03-19 07:55:22 -07:00
Paul Hu
90e2f900ca
Merge "Revert "Rename some failed causes""
...
am: e3cc2e6c98
Change-Id: I29efdbba830f08ca1a0c01058fce719c8b501dbe
2019-03-19 07:46:17 -07:00
Treehugger Robot
e3cc2e6c98
Merge "Revert "Rename some failed causes""
2019-03-19 14:31:34 +00:00
Jack Yu
20d71403b8
API review feedback changes
...
Made the follwing changes based on API council review
feedback
1. Made the class and its Builder class final
2. Removed methods that should not be in the builder
3. Changed the return type of available services
from array to list.
Test: Unit tests
Bug 127657991
Change-Id: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
2019-03-19 07:01:22 -07:00
Cody Kesting
1961871f40
Add class comment to avoid extending ServiceState class.
...
ServiceState implements Parcelable and all 'Parcelables' are required to
be final, per the Android API Guidelines (go/android-api-guidelines).
This won't be changed for historical reasons, but clients should avoid
extending this class.
Bug: 128865231
Test: non-functional change that won't impact tests.
atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: Ib369f1449a3e085f404fff1c706fda0b76d42890
2019-03-19 13:57:28 +00:00
Jack Yu
f9d06c78d8
Renamed NetworkRegistrationState to NetworkRegistrationInfo
...
API review changes. The class covers more information other than
registration state.
Test: Build
Bug: 127657991
Merged-In: I8af36b388182ab08257b64c37078f156d4821709
Change-Id: I8af36b388182ab08257b64c37078f156d4821709
(cherry picked from commit e27d3fde88 )
2019-03-19 06:55:12 -07:00
TreeHugger Robot
ebd08ce95f
Merge "Document type of euicc privileged action extras."
2019-03-19 03:40:52 +00:00
Chen Xu
20306b0038
Merge "add two more parameters to carrier id TestAPI"
2019-03-19 03:32:03 +00:00
Paul Hu
f5e0242249
Revert "Rename some failed causes"
...
This reverts commit 1c405b73b0 .
Reason for revert: <INSERT REASONING HERE>
Change-Id: I4af7c87d8a8a988c2f1c3dc6662027c6fcd34088
2019-03-19 03:11:31 +00:00
Brad Ebinger
4e7abb98d1
Merge "Emergency API review" am: 853983ef32
...
am: c6d673901a
Change-Id: I7d869f5e3ef5b98fb52a429687b4a0875baa835d
2019-03-18 17:29:04 -07:00
Brad Ebinger
c6d673901a
Merge "Emergency API review"
...
am: 853983ef32
Change-Id: Idcfa450fba2e08d825bbe2b95094a7e7f070421b
2019-03-18 16:50:54 -07:00
Shuo Qian
981b0a7653
Merge "Default carrier config key in carrier config manager"
2019-03-18 23:37:39 +00:00
Brad Ebinger
853983ef32
Merge "Emergency API review"
2019-03-18 23:29:34 +00:00
Tyler Gunn
35fd7c906e
Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." am: e2a486a7b2 am: 55c3b4a993
...
am: 0e79151f2d
Change-Id: Ia4380a4d25dd88243f123eb48b36bd3d94cfbb32
2019-03-18 16:06:46 -07:00
Tyler Gunn
0e79151f2d
Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." am: e2a486a7b2
...
am: 55c3b4a993
Change-Id: Icb80c34bf81ec882d7da7b47afc7f7853059846e
2019-03-18 15:58:21 -07:00
Patrick Huang
4db3a997b6
Document type of euicc privileged action extras.
...
Bug: 128317614
Test: Test on phone
Change-Id: Ib7978807376c7987d3aa8a7e3d1dc4bc6c814c6a
2019-03-18 15:56:39 -07:00
Tyler Gunn
55c3b4a993
Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated."
...
am: e2a486a7b2
Change-Id: Ib0d700c29e28166081b81cbdaeb8ad278d7ca21c
2019-03-18 15:46:56 -07:00
Tyler Gunn
e2a486a7b2
Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated."
2019-03-18 22:18:52 +00:00
sqian
3b5f87f965
Emergency API review
...
1) Remove 'current' in Emergency APIs
2) Remove nullable
3) Handled the null Telephony service case
4) Hide getEmergencyServiceCategoryBitmask
5) Make getEmergencyUrns unmodifiable
Test: Treehugger
Bug: 122368381
Bug: 126699022
Bug: 126701211
Merged-In: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
Change-Id: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
2019-03-18 15:18:00 -07:00
sqian
4be071a560
Default carrier config key in carrier config manager
...
Bug: 123038126
Test: Treehugger
Change-Id: Ia3cc464519bb99e68f995f6bf9d83a3d987716d5
2019-03-18 14:10:53 -07:00
Jordan Liu
dc0ac4fa83
Merge "Add slot based ICC channel APIs" am: e278d2bcdd
...
am: ca075c3176
Change-Id: Ia43d743a06f21a812f74f98541e618f627dcf4a7
2019-03-18 13:56:12 -07:00