Commit Graph

7788 Commits

Author SHA1 Message Date
Brad Ebinger
3b176bc1de Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
am: dedc27142d

Change-Id: Ieccb97fb300455e9338c022c46466bed355be79a
2019-03-22 10:36:07 -07:00
Brad Ebinger
dedc27142d Merge "Query isEmergencySmsMode API when checking if emergency for GPS" 2019-03-22 17:18:47 +00:00
Andrei-Valentin Onea
02f43694e4 Merge "Add @UnsupportedAppUsage annotations"
am: 88e2a9aaee

Change-Id: I63ae22279aa46522b652cdc9329567a04a7ef136
2019-03-22 06:25:44 -07:00
Andrei Onea
fbc8cfdc94 Add @UnsupportedAppUsage annotations
For packages:
  android.companion
  android.filterfw
  android.hardware.camera2.utils
  android.inputmethodservice
  android.net.nsd
  android.os
  android.preference
  android.security.keymaster
  android.service.dreams
  android.telecom
  android.telephony.ims.compat.feature
  android.telephony
  android.util
  android.view.accessibility
  android.media.effect

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I9c2f8347952f3cc65759472b0e1a2717b285e44e
Change-Id: I14793863cf815fa3383fec6c6bf5a9365c2e17eb
2019-03-22 11:43:11 +00:00
Jack Yu
8a6dbb8446 Merge changes from topic "iwlan_api_review"
am: ac3406f9c6

Change-Id: I39775146064de0041c963a460f20a65e94fa6e78
2019-03-21 17:50:56 -07:00
Brad Ebinger
7d73c0b4d6 Merge "Fix build due to no explanatory comment."
am: 0b6c77167e

Change-Id: Icc0a8be233ab0a5f5f86541b452ae82e6415fd4c
2019-03-21 17:44:07 -07:00
Jack Yu
ac3406f9c6 Merge changes from topic "iwlan_api_review"
* changes:
  IWLAN API review changes
  Unhide methods required for Parcelable class
  Added annotations to the API
2019-03-22 00:29:07 +00:00
Brad Ebinger
0b6c77167e Merge "Fix build due to no explanatory comment." 2019-03-22 00:25:11 +00:00
Patrick Huang
e41be2c876 Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"
am: 9a1888ce62

Change-Id: I342884174fbaaa13b0973038f6cb70258ba436d7
2019-03-21 16:51:05 -07:00
Nathan Harold
2c3dba9194 Merge "Expose CellInfoTdscdma"
am: 0b88e07ea5

Change-Id: I6ec42e526ba4a26f26b263c9ab7d83a10a476e97
2019-03-21 16:35:46 -07:00
Treehugger Robot
9a1888ce62 Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED" 2019-03-21 23:35:39 +00:00
Nathan Harold
0b88e07ea5 Merge "Expose CellInfoTdscdma" 2019-03-21 23:19:43 +00:00
Brad Ebinger
ef44a92a73 Fix build due to no explanatory comment.
Test: manual build
Change-Id: Ibfb3a114c74d673eb94dd2fa1fc9b9918283e9db
2019-03-21 15:31:01 -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
Jack Yu
c876b65663 IWLAN API review changes
Made several API changes per API council
suggestions.

Test: Manual + unit tests
Bug: 127812471
Bug: 128607082

Merged-In: I0f93c07207b10b566e9f858361e55b18dc0881a0
Change-Id: I0f93c07207b10b566e9f858361e55b18dc0881a0
(cherry picked from commit 806b64228d)
2019-03-21 14:12:24 -07:00
Jack Yu
aff62b8a32 Unhide methods required for Parcelable class
Those methods were already public in the base class.

Test: Build
FIXES: 126702898

Merged-In: Ibce8f9bf5d1a3ebf9225fa46422dc3c78e29b1f6
Change-Id: Ibce8f9bf5d1a3ebf9225fa46422dc3c78e29b1f6
(cherry picked from commit 654bb21f70)
2019-03-21 13:40:37 -07:00
Jack Yu
22241e1788 Added annotations to the API
Added @NonNull and @Nullable to APIs.

Test: Build
Bug: 126702898

Merged-In: I697298837858829bb0851aba389159701fa0fc5e
Change-Id: I697298837858829bb0851aba389159701fa0fc5e
(cherry picked from commit 1eb3f0cdae)
2019-03-21 13:39:21 -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
Patrick Huang
d1385242ad Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED
Bug: 126242076
Test: Test on phone to ensure the extra is received by LPA
Change-Id: I1367fa988dbc71eb30631ebf9903309eba3ef96d
Merged-In: I1367fa988dbc71eb30631ebf9903309eba3ef96d
2019-03-21 11:22:39 -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
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
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
Nathan Harold
b2bfb29595 Expose CellInfoTdscdma
Expose CellInfoTdscdma and CellSignalStrengthTdscdma
which are both returned by existing public APIs.
This corrects an oversight whereby the values returned
by the public API could not be used by callers.

Existing CTS tests already validate these structures as
though they were public (which was the intention).

Note, this was also requested as feedback in the public
beta.

Bug: 128880490
Test: cts - atest CellInfoTest; atest SignalStrengthTest
Merged-In: Ia75ea9af52796729e26b85ca04fd97b6c9b80f8e
Change-Id: Ia75ea9af52796729e26b85ca04fd97b6c9b80f8e
2019-03-21 01:10:18 +00: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
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
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
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
Brad Ebinger
5eeb79d4b5 Query isEmergencySmsMode API when checking if emergency for GPS
When location SUPL request comes in for GPS NI handler,
also check emergency SMS mode in telephony, which
is true for a carrier defined amount of time after an
emergency SMS is sent.

Bug: 126091115
Test: manual - send fake emergency sms, check api is true.
Change-Id: I34d26d2940af5b0c412e20ce3668344da8656339
2019-03-20 11:11:10 -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
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
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