Commit Graph

7789 Commits

Author SHA1 Message Date
Shuo Qian
8dc69deb34 Merge "Add Prefix per Carrier requirement" am: 592e9abb0b
am: c9da35e296

Change-Id: I1bd9b341e5f7ac2d512e3a22ecd0a3a8af2b69a8
2019-03-20 16:11:18 -07:00
Shuo Qian
c9da35e296 Merge "Add Prefix per Carrier requirement"
am: 592e9abb0b

Change-Id: I84cae8e10cd495d2504f6dddba0f622b8c3b49a0
2019-03-20 15:57:24 -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
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
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
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
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
Brad Ebinger
853983ef32 Merge "Emergency API review" 2019-03-18 23:29:34 +00: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
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
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
Brad Ebinger
8f1a1f83dc Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs" am: b50cea987b
am: 19aa681ad5

Change-Id: I41fbf2df61f1156b231189730690c9d48c04c3c4
2019-03-18 13:41:22 -07:00
Jordan Liu
ca075c3176 Merge "Add slot based ICC channel APIs"
am: e278d2bcdd

Change-Id: Ifaaddfc58ee684393bcabfc214d72746125ed158
2019-03-18 13:38:37 -07:00
Brad Ebinger
19aa681ad5 Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs"
am: b50cea987b

Change-Id: I958118cbf6bbe1da784e970b8b2195c52e198855
2019-03-18 13:28:10 -07:00
Jordan Liu
e278d2bcdd Merge "Add slot based ICC channel APIs" 2019-03-18 18:36:54 +00:00
Brad Ebinger
b50cea987b Merge "Integrate FEATURE_TELEPHONY_IMS feature into APIs" 2019-03-18 17:35:27 +00:00
Tyler Gunn
b56fd28937 Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated.
In Q we have introduced new APIs which replace the need for an app to
get the phone number for calls through the phone state broadcast.  As
such the EXTRA_INCOMING_NUMBER is being marked deprecated.  Developers
are encouraged to use the new replacement APIs instead.

Test: Make API / build
Fixes: 128835519
Change-Id: If1bc0076392281887f6cc8017788a07f170c7a17
2019-03-18 09:21:39 -07:00
Jack Yu
bc8cc99b20 Merge "Moved transport to IntDef" am: b7463a63d1
am: f713c1ff26

Change-Id: I9a68e86efd37018db87dfb09af58fba8b99c3b15
2019-03-15 16:40:23 -07:00
Jack Yu
f713c1ff26 Merge "Moved transport to IntDef"
am: b7463a63d1

Change-Id: I80d2bf5b3d195d4b05135006418ba4b638271f4f
2019-03-15 16:31:06 -07:00
Treehugger Robot
b7463a63d1 Merge "Moved transport to IntDef" 2019-03-15 23:21:29 +00:00
Pengquan Meng
91ae15122f Merge "[API feedback] api fixed for getSlotMapping" am: 9931252c3f
am: 58fed7fac6

Change-Id: I858a9014859f6c44862165cc7a970bdc20176fe4
2019-03-15 16:08:01 -07:00
Pengquan Meng
58fed7fac6 Merge "[API feedback] api fixed for getSlotMapping"
am: 9931252c3f

Change-Id: I68489daa92188232f3d1489226f71c14d5b2b14d
2019-03-15 15:58:45 -07:00
Tyler Gunn
f8df85bdc2 Extend light-greylist of some TelephonyManager APIs until Q.
The reasonable replacement for these APIs is
ImsMmtelManager#isAvailable(int, int); however that class is a system
API.  Given how late we are in the release cycle,  can make
ImsMmtelManager public R and leave these greylisted for now.

Test: Manual
Bug: 128696104
Change-Id: I64fa9e079e26ba16ff9ace098091c4094e9a7b33
2019-03-15 15:41:17 -07:00
Pengquan Meng
9931252c3f Merge "[API feedback] api fixed for getSlotMapping" 2019-03-15 22:38:46 +00:00
Sooraj Sasindran
acf23ad83e Merge changes from topic "Porting-ONSAPIChanges" am: 31c7607ee6
am: f6b0d994a7

Change-Id: Idf128d17a2fac096ca5e28000648638c1d70fff2
2019-03-15 13:18:47 -07:00