Commit Graph

5069 Commits

Author SHA1 Message Date
Brad Ebinger
81304407aa Merge "Deprecate SystemApi that was accidently made public in P" am: 18870b2e4e
am: 1cb491e423

Change-Id: Ieafcc2c15eb0b7a2968faf979fe93e31088e86b5
2019-03-21 15:07:39 -07:00
Brad Ebinger
1cb491e423 Merge "Deprecate SystemApi that was accidently made public in P"
am: 18870b2e4e

Change-Id: I235d5466ac67e60d4cf59c28131c30421fbfd18c
2019-03-21 14:58:24 -07:00
Treehugger Robot
18870b2e4e Merge "Deprecate SystemApi that was accidently made public in P" 2019-03-21 21:46:25 +00:00
Michele Berionne
296e21451d Merge "Modified MultiSim APIs" am: c5461c4490
am: be4d9657a7

Change-Id: I9aa4e0231b7f546f8e26ba9a77c20f4e4a89dc86
2019-03-21 12:19:47 -07:00
Michele Berionne
be4d9657a7 Merge "Modified MultiSim APIs"
am: c5461c4490

Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0
2019-03-21 12:07:24 -07:00
Michele Berionne
c5461c4490 Merge "Modified MultiSim APIs" 2019-03-21 18:53:11 +00:00
Jordan Liu
1cf81ee892 Merge "Update documentation" am: ae25b62203
am: ea992811ff

Change-Id: Ic4d2927b28a1684f2bd926be8c27b2215104d5c6
2019-03-21 11:14:33 -07:00
Jordan Liu
ea992811ff Merge "Update documentation"
am: ae25b62203

Change-Id: Idbe416dbd182eea082c67de330f38f3696f81b11
2019-03-21 10:55:23 -07:00
Jordan Liu
ae25b62203 Merge "Update documentation" 2019-03-21 17:36:14 +00:00
Michele
8e17c7064d Modified MultiSim APIs
Capitalize S in Multisim.
isMultiSimSupported should return three states, to describe the three possible cases
(hardware not supported, hardware supported but carrier restricted, available)

Bug: 128524079
Test: compilation
Change-Id: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
Merged-In: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
2019-03-20 23:04:52 -07:00
Patrick Huang
c858e75f8d Merge "Document type of euicc privileged action extras." am: 4bcdd78d56
am: cc40f6a046

Change-Id: I95e4dfa1a21d7acdbd3cabc5ef6a438e2941e036
2019-03-20 19:33:08 -07:00
Patrick Huang
cc40f6a046 Merge "Document type of euicc privileged action extras."
am: 4bcdd78d56

Change-Id: I7a3c7f596e8b17aa4c16663bbd652229c5315353
2019-03-20 19:22:35 -07:00
Patrick Huang
4bcdd78d56 Merge "Document type of euicc privileged action extras." 2019-03-21 02:09:20 +00:00
Patrick Huang
4569889818 Merge "Document permissions for euicc privileged actions." am: 7e2e333769
am: fd5caa2de4

Change-Id: Id8636717370f966aace260d4865b2b8024560a0a
2019-03-20 19:02:03 -07:00
Patrick Huang
fd5caa2de4 Merge "Document permissions for euicc privileged actions."
am: 7e2e333769

Change-Id: Ief36f070adf466447ec676487817f21d550b5527
2019-03-20 18:52:41 -07:00
Treehugger Robot
7e2e333769 Merge "Document permissions for euicc privileged actions." 2019-03-21 01:41:23 +00:00
Jack Yu
8d824a7786 Merge "API review feedback changes" am: 84ea11384d
am: 6c1815ac79

Change-Id: Ibc28787179d9053773f4557b9058713fb57b1586
2019-03-20 16:52:00 -07:00
Jack Yu
6c1815ac79 Merge "API review feedback changes"
am: 84ea11384d

Change-Id: I37c4f558d313d3ea7f201633273dc53f6ffd128c
2019-03-20 16:36:19 -07:00
Treehugger Robot
84ea11384d Merge "API review feedback changes" 2019-03-20 23:22:20 +00:00
Shuo Qian
8dc69deb34 Merge "Add Prefix per Carrier requirement" am: 592e9abb0b
am: c9da35e296

Change-Id: I1bd9b341e5f7ac2d512e3a22ecd0a3a8af2b69a8
2019-03-20 16:11:18 -07:00
Patrick Huang
c78c89d055 Document type of euicc privileged action extras.
Bug: 128317614
Test: Test on phone
Change-Id: Ib7978807376c7987d3aa8a7e3d1dc4bc6c814c6a
Merged-In: Ib7978807376c7987d3aa8a7e3d1dc4bc6c814c6a
2019-03-20 15:57:55 -07:00
Shuo Qian
c9da35e296 Merge "Add Prefix per Carrier requirement"
am: 592e9abb0b

Change-Id: I84cae8e10cd495d2504f6dddba0f622b8c3b49a0
2019-03-20 15:57:24 -07:00
Patrick Huang
dafb87c957 Document permissions for euicc privileged actions.
Bug: 128317064
Test: Test on phone
Change-Id: I285597e48e97f1b4ffe4b4eb4ac68010905f4e1f
Merged-In: I285597e48e97f1b4ffe4b4eb4ac68010905f4e1f
2019-03-20 15:35:14 -07:00
sqian
108cb12a6a Add Prefix per Carrier requirement
Some carrier requires if users dial an emergency number address with
some prefix, the combination of the prefix and the address is also a
valid emergency number to dial.

Bug: 122429213
Test: Treehugger
Change-Id: Ib9b96bb0a210aba64a8652984d22f3564813fa9d
Merged-In: Ib9b96bb0a210aba64a8652984d22f3564813fa9d
(cherry picked from commit 69f48c5e90)
2019-03-20 14:16:14 -07:00
Jack Yu
1b9eafb4f4 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

Merged-In: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
Change-Id: I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2
(cherry picked from commit 20d71403b8)
2019-03-20 14:08:27 -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
Jordan Liu
705b2c7033 Update documentation
Fixes: 128919950
Test: no change to behavior
Change-Id: If303386de0ce8bdc215eb42ed8ad313cbb91ca44
2019-03-20 13:26:43 -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
Brad Ebinger
6898dae9fb Deprecate SystemApi that was accidently made public in P
ImsFeature.Capabilities was accidently made public in P
due to a reference to it in another @SystemApi method.
Marking as @Deprecated in Q and then moving back to @hide
in R.

Bug: 115639348
Test: manual
Change-Id: Iab0d0c9227798b9f4e153d1c5a0a4e16353ee87c
2019-03-20 10:55:41 -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
Jack Yu
936c536bba Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" 2019-03-20 06:30:53 +00: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
Brad Ebinger
264915fd18 Make ImsException final
Bug: 128902253
Test: atest FrameworksTelephonyTests
Change-Id: I88058f8382978163718de8194249fad87ae52d10
2019-03-19 14:48:37 -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
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
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