Commit Graph

5005 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
f6b0d994a7 Merge changes from topic "Porting-ONSAPIChanges"
am: 31c7607ee6

Change-Id: Ibca8c0202ff702be57f128b0cc24a8679d0a8083
2019-03-15 12:53:18 -07:00
Sooraj Sasindran
3e08825d4c Provide network bands in AvailableNetworkInfo
am: c9948da02a

Change-Id: Ib7ba8c29f8e8ed7237b5afcccf9d1694596f1263
2019-03-15 12:46:05 -07:00
Sooraj Sasindran
31c7607ee6 Merge changes from topic "Porting-ONSAPIChanges"
* changes:
  Should not turn on validation for data
  Provide network bands in AvailableNetworkInfo
2019-03-15 19:31:55 +00:00
Cody Kesting
842fd65fe4 Merge "Fix ServiceState.hashCode() bug."
am: 466ff7b990

Change-Id: I9705b0857ecc5f9a809e7e640fbc35151d244211
2019-03-15 09:11:09 -07:00
Cody Kesting
99ef1d40dc Fix ServiceState.hashCode() bug.
ServiceState currently overrides hashCode() incorrectly. It hashes an
Array field without using Arrays.hashCode(), meaning that the default
Object.hashCode() implementation is used (which is based on the address
of the Array field). This allows equivalent ServiceState instances to
produce different hashes.

Bug: 128609620
Test: atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: I40a7d0b7ebab6d2a1be47ea63a6d223c4c13700b
2019-03-15 15:46:09 +00:00
Jack Yu
6f7b30499c Moved transport to IntDef
Moved out from the sub class per API review feedback.

Test: Build
Bug: 128607082
Merged-In: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
Change-Id: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
2019-03-14 20:32:16 -07:00
Paul Hu
4a862a637a Merge "Rename some failed causes"
am: f6382802ef

Change-Id: I01b6d267c4b2cbf23d6cdc2dea770f5da99fa155
2019-03-14 17:56:12 -07:00
Paul Hu
f6382802ef Merge "Rename some failed causes" 2019-03-15 00:43:42 +00:00
Shuo Qian
614f1e0bba Merge "Explain the difference of isValid, isActive, isUsable"
am: 9c649215f6

Change-Id: I8146a074fa87747e91a22da4a4bfb696dcc7deef
2019-03-14 15:20:03 -07:00
Shuo Qian
9c649215f6 Merge "Explain the difference of isValid, isActive, isUsable" 2019-03-14 22:05:46 +00:00
Brad Ebinger
af5f2a5f52 Integrate FEATURE_TELEPHONY_IMS feature into APIs
Bug: 118823732
Test: manual
Merged-In: Iabb0e7cadae52d8ebe922f61a878298ad4dd04b0
Change-Id: Iabb0e7cadae52d8ebe922f61a878298ad4dd04b0
2019-03-14 14:57:00 -07:00
Jordan Liu
118895f571 Add slot based ICC channel APIs
These are SystemApis which require MODIFY_PHONE_STATE, and can be used
to open ICC channels when there is no available subscription, using the
slot index instead of subId.

Bug: 126578014
Test: builds
Change-Id: I3f47a8ac07813ea9e326c7d76123352708bfeea2
Merged-In: I3f47a8ac07813ea9e326c7d76123352708bfeea2
2019-03-14 14:25:25 -07:00
sqian
0bcdd6cbd4 Explain the difference of isValid, isActive, isUsable
Bug: 118675257
Test: compile
Change-Id: Ibec1bf7929991ca0e2910684f5216ab8372d4e95
2019-03-14 11:34:01 -07:00
Chen Xu
3a720c6739 Merge "fix the issue that setPreferredNW send wrong RAT to HAL"
am: 4837dbe536

Change-Id: I33e98b0f4ac9b0d7130b9e6b25fec5b76409e021
2019-03-13 18:04:44 -07:00
Chen Xu
4837dbe536 Merge "fix the issue that setPreferredNW send wrong RAT to HAL" 2019-03-14 00:47:07 +00:00
Sooraj Sasindran
3b09d711f9 Should not turn on validation for data
Should not turn on validation for data switch every time.
Provide result as a callback

Test: verified manually
Bug: 126264455
Merged-In: I5df2311d91fdab34563148b4466163696e52faf9
Change-Id: I5df2311d91fdab34563148b4466163696e52faf9
2019-03-13 15:36:11 -07:00
Iris Chang
52688c33ee Merge "Should return the number of supported SIM cards"
am: 09a4ee1988

Change-Id: Ia8d237fa510ca47c4fcd04a7d28812612e01d248
2019-03-13 14:57:06 -07:00