Commit Graph

11232 Commits

Author SHA1 Message Date
Brad Ebinger
72e3eef33c API fix: getProprietaryCallExtras should not return null
Bug: 149216142
Fixes: 151172594
Test: atest CtsTelephonyTestCases
Merged-In: I7bd0d44f08169d41396a8cb202f3928e14bc5939
Change-Id: I7bd0d44f08169d41396a8cb202f3928e14bc5939
2020-03-20 16:26:51 -07:00
Peter Wang
54af9046ac Merge "[API Review] APIs in SubscriptionManager" 2020-03-20 19:54:58 +00:00
Jack Yu
c33377b077 Merge changes from topic "lte_bands"
* changes:
  Added bands from HAL 1.5
  Convert getAdditionalPlmns to return a Set
2020-03-20 19:03:49 +00:00
Sarah Chin
3986bb5040 Merge "Update AccessNetworkConstants to uses values from HAL" 2020-03-20 04:04:12 +00:00
Sarah Chin
35554486b7 Update AccessNetworkConstants to uses values from HAL
Test: build
Bug: 150479290
Change-Id: I46034fce8f8f13b555a0cfb05cc5a9f076c7251a
Merged-In: I46034fce8f8f13b555a0cfb05cc5a9f076c7251a
2020-03-19 18:47:44 -07:00
Sarah Chin
c0a1448ac8 Add response and indication for CellInfo
cellInfoList_1_5
getCellInfoListResponse_1_5
networkScanResult_1_5

Test: atest RILTest
Bug: 151774189
Change-Id: I1ba01eb97f13f843fd27b65d4a2b1049e97ead71
Merged-In: I1ba01eb97f13f843fd27b65d4a2b1049e97ead71
2020-03-19 18:38:14 -07:00
Peter Wang
0ddf44070b [API Review] APIs in SubscriptionManager
Bug: 146362772
Bug: 148180034
Test: atest SubscriptionControllerTest, TelephonyDatabaseHelperTest, TelephonyProviderTest
Change-Id: I77cad8f828ac38976355b7a5f3e8d757b73694ca
Merged-In: I77cad8f828ac38976355b7a5f3e8d757b73694ca
2020-03-19 16:06:52 -07:00
Philip P. Moltmann
9ed7e7f1b1 Merge "Pipe through attributeTag for one self-permission check" 2020-03-19 19:41:17 +00:00
Jack Yu
63fcb9b978 Hide API
Hide API that is only used by telephony registry.

Test: Telephony sanity tests
Bug: 149850449
Merged-In: Ie4c46de336097fb7231291f15048329aea0b639c
Change-Id: Ie4c46de336097fb7231291f15048329aea0b639c
(cherry picked from commit f0df0ba2ba)
2020-03-19 10:27:36 -07:00
Jack Yu
49a35718f8 Added bands from HAL 1.5
Test: Manual
Merged-In: Ib155ee5c2f660c8866a7be91e7f62a8c90e78d8e
Change-Id: Ib155ee5c2f660c8866a7be91e7f62a8c90e78d8e
Fix: 149475773
(cherry picked from commit 16e5d2a0f3)
2020-03-18 22:17:04 -07:00
Nathan Harold
a4e79e3d41 Convert getAdditionalPlmns to return a Set
Set support is a little weird in Java and Android.
Java doesn't support ArraySet, but Android does; Parcel
has both read/write for ArraySet, but they are @hide. Thus,
my options were limited to:
-use the hidden parcel methods
-convert between list and set in the constructor and parcel code
-convert between list and set in the getter
-maintain parallel data structures.

Using the hidden methods seemed cleanest. Since they are
@UnsupportedAppUsage they can't be credibly removed.

In addition, the HAL code doesn't understand Set<> only List<> so
I was faced with the choice of having 2 constructors or using
Collection<>, which actually works just fine and avoids changing
a hundred or so unit tests with no ill effect.

Bug: 149476549
Test: atest FrameworksTelephonyTests
Test: (cts) atest CellInfoTest
Merged-In: I9dfa5f59512f3d1305187cc383c4069ceaaf27fd
Change-Id: I9dfa5f59512f3d1305187cc383c4069ceaaf27fd
(cherry picked from commit 5522de1af3)
2020-03-18 22:05:36 -07:00
Jack Yu
7a5e98e131 Added the high usage hidden APIs back
Added the high usage hidden APIs back for Q or older
apps. Apps built on R SDK should use the new API
getNetworkCountryIso(int).

Test: Build
Bug: 150368215
Merged-In: I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c
Change-Id: I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c
(cherry picked from commit ff8275e6b9)
2020-03-18 21:51:21 -07:00
Philip P. Moltmann
a345428817 Pipe through attributeTag for one self-permission check
... Also remove unused aidl methods.

Bug: 136595429
Test: TH
Change-Id: I37bf62a83c1043acdc878f747ef85d719766f991
2020-03-18 18:16:22 -07:00
Nathan Harold
2ea0b56cff Merge changes from topics "barring-cp", "nri-rplmn"
* changes:
  Allow Nullable Registered PLMN
  Return the RPLMN from NetworkRegistrationInfo
  Expose PreciseDataConnectionstate#getApnSetting()
  Skip sanitizing location info for Null Barring CID
  Remove BarringInfo#isServiceBarred()
  Introduce a new RIL request constant to support getBarringInfo.
  Update BarringInfo as Barring HAL date stuctures updated
  Add a BARRING_TYPE_UNKNOWN for Unreported Barring
  Add Callback to notify changes of barring status
2020-03-18 23:41:57 +00:00
Nathan Harold
4ad89fb955 Allow Nullable Registered PLMN
API Council has noted an inconsistency
between setRegisteredPlmn() and getRegisteredPlmn().

Because other methods such as CellIdentity#getMncStr()
are already nullable, it's reasonable to allow the
registered PLMN to be null in the event that the device
isn't registered.

Bug: 149476549
Test: make update-api && make && atest NetworkRegistrationInfoTest
Merged-In: Ib38e72a6bdbaf4e1fd439e92f835daa6f87ceb73
Change-Id: Ib38e72a6bdbaf4e1fd439e92f835daa6f87ceb73
(cherry picked from commit 2fb0bc50f9)
2020-03-18 23:41:32 +00:00
Nathan Harold
ad4d8569e7 Return the RPLMN from NetworkRegistrationInfo
Add an API to get the RPLMN in network registration info.

This PLMN-ID is the one chosen from the PLMN IDs broadcast
by the cell for registration purposes.

Bug: 135921133
Test: make update-api && make offline-sdk-docs && make
      && atest FrameworksTelephonyTests
Merged-In: I82f9150e185d9809572d246b57ea42f14ad64f15
Change-Id: I82f9150e185d9809572d246b57ea42f14ad64f15
(cherry picked from commit 2b14af22da)
2020-03-18 23:41:13 +00:00
Nathan Harold
ca2e76571e Expose PreciseDataConnectionstate#getApnSetting()
Expose an API that was accidentally left as package private.

This is was missed when exposing other methods for the same
class; however, other methods have been deprecated based on
the presumption that this method is available in the public
API.

This method deprecated:
PreciseDataConnectionState#getDataConnectionApnTypeBitMask()
PreciseDataConnectionState#getDataConnectionApn()

Bug: 148565164
Bug: 147600208
Test: make update-api && make offline-sdk-docs
Merged-In: I0207c18d853d0b83db2622ff3abcda98565eac30
Change-Id: I0207c18d853d0b83db2622ff3abcda98565eac30
(cherry picked from commit a61992b67a)
2020-03-18 23:40:51 +00:00
Treehugger Robot
7db4916a40 Merge "Ims: Add <RETRY_CALL_FAIL_REASON> and <RETRY_CALL_FAIL_NETWORK> extras" 2020-03-18 21:05:29 +00:00
Nathan Harold
b41802887f Skip sanitizing location info for Null Barring CID
If the CellIdentity in BarringInfo is null, then it
doesn't need to be location-info sanitized before
being provided.

Bug: 148695512
Test: atest CarrierApiTest
Merged-In: I8db108a91bcfcdefb48ff3779d972e126bc1d7d2
Change-Id: I8db108a91bcfcdefb48ff3779d972e126bc1d7d2
(cherry picked from commit 5f8ab16877)
2020-03-18 18:39:20 +00:00
sqian
a64f352596 API Council Feedbacks
1) Add Annotation for getCarrirPrivilegeStatus
2) Remove NullProinterException throwing in isDataConnectionAllowed
3) Add SdkConstant for ACTION_UPDATE_EMRGENCY_NUMBER_DB

Test: Treehugger
Bug: 148218347
Bug: 151455822
Change-Id: I4943491abf70641f9379862a67941295a4cf67f9
Merged-In: I4943491abf70641f9379862a67941295a4cf67f9
(cherry picked from commit 43c2f470ed)
2020-03-18 18:28:21 +00:00
Nathan Harold
e3adb3a0a6 Remove BarringInfo#isServiceBarred()
Address API Council comments:
-Remove convenience method isServiceBarred()
-Pre-construct default barring objects rather than
 construct new ones in case the struct is sparsely
 populated.

Bug: 148553656
Test: atest BarringInfoTest
Change-Id: Ib0cbdfb431e1fc57afe16595406e0a4d70af8945
(cherry picked from commit 40cd94dde0)
2020-03-18 10:18:28 -07:00
Rambo Wang
ca33ed2d7e Introduce a new RIL request constant to support getBarringInfo.
Bug: 148981484
Test: make
Merged-In: I05e0abe29f6d8c5796c777fd83d76e398e35b6b1
Change-Id: I05e0abe29f6d8c5796c777fd83d76e398e35b6b1
(cherry picked from commit 284118f9e0)
2020-03-18 09:52:24 -07:00
Rambo Wang
2251158835 Update BarringInfo as Barring HAL date stuctures updated
Bug: 148102466
Test: atest BarringInfoTest
Merged-In: I04993b2dcef276f5af7d0780f954393838b77f8e
Change-Id: I04993b2dcef276f5af7d0780f954393838b77f8e
(cherry picked from commit 7ce04ea387)
2020-03-18 09:52:16 -07:00
Nathan Harold
3c5e57cd07 Add a BARRING_TYPE_UNKNOWN for Unreported Barring
For vendors that do not support barring info reports,
add an additional BARRING_TYPE to express the difference
between unbarred and unknown barring status.

Bug: 143226991
Test: make update-api && make && atest BarringInfoTest
Merged-In: Ie9314c5612536bf181a3c0e52876b1804ed7cce2
Change-Id: Ie9314c5612536bf181a3c0e52876b1804ed7cce2
(cherry picked from commit d5b9cc737b)
2020-03-18 09:52:10 -07:00
Nathan Harold
61b5d6741b Add Callback to notify changes of barring status
-Create a BarringInfo class to pass Barring information
 from HAL to PhoneStateListener.
-Add a multi-callback registrant so that ServiceStateTracker
 and potentially DcTracker can also listen to barring info in
 the future.

Bug: 143226991
Test: make update-api && make && atest BarringInfoTest
Merged-In: I08240259f3142beeca991238bf705236f0303954
Change-Id: I08240259f3142beeca991238bf705236f0303954
2020-03-18 09:52:10 -07:00
Zoey Chen
685fe6f443 Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock" 2020-03-18 05:15:05 +00:00
zoey chen
51670b219f [TelephonyMainline] @hide system api since we'll revisit in S. - IccLock
Test: make
Bug: 146983487
Change-Id: Iabc3300e883e2afad6145f9bb1410d0606a35c11
Merged-In: Iabc3300e883e2afad6145f9bb1410d0606a35c11
2020-03-18 10:51:38 +08:00
Alex Lin
b375f0bd4a Merge changes from topic "add-error-code"
* changes:
  Update EuiccService encodeSmdxSubjectAndReasonCode
  Rename ErrorCode
  Add public error codes to Euicc public API
2020-03-17 23:01:43 +00:00
Amit Mahajan
c070b1de57 Merge "Revert "Fix permission check for get/setSmscAddress."" 2020-03-17 21:54:54 +00:00
Amit Mahajan
4cddbf8ddb Revert "Fix permission check for get/setSmscAddress."
This reverts commit 06b248fa6c.

Reason for revert: b/150666039

Change-Id: Ida963267b4ffd054b58471731347b523b3fcd456
Merged-in: I67a4ffe94e3caabd04a5b9305de3e476867bfbd1
2020-03-17 20:39:06 +00:00
SongFerngWang
4e964f3617 upperLayerIndicator_r15 is optional, nr state design changed
Bug: 151270999
Test: build pass.
Change-Id: I7864077df6dad9a8bf70718615e3cfeb8159a50e
Merged-In: I7864077df6dad9a8bf70718615e3cfeb8159a50e
2020-03-17 14:13:40 +08:00
Jack Yu
d5848b795d Merge "Removed permission check" 2020-03-17 03:15:32 +00:00
Zoey Chen
1724914c9f Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" 2020-03-17 02:45:25 +00:00
Zoey Chen
eff8e993c7 Merge "[TelephonyMainline] @hide system api since we'll revisit in S - Cdma" 2020-03-16 11:27:42 +00:00
Ravi Paluri
4a19cd8cd9 Ims: Add <RETRY_CALL_FAIL_REASON> and <RETRY_CALL_FAIL_NETWORK> extras
Add <RETRY_CALL_FAIL_REASON> and <RETRY_CALL_FAIL_NETWORKTYPE>
<RETRY_CALL_FAIL_REASON> holds the reason why the call
is redialed and <RETRY_CALL_FAIL_NETWORKTYPE> holds the networkType
on which lower layers may attempt redialing the call.

Test: Manual
Bug: 148315767
Change-Id: If0710b7511d0664fd3adfac65132b36b5cb3b6ba
2020-03-16 14:47:34 +05:30
zoey chen
b81b4e5cd8 [TelephonyMainline] @hide system api since we'll revisit in S - Cdma
Test: make
Bug: 148404061
Change-Id: I83dbaa24f94f5cca846d6ca71c7e6814ecd832b8
Merged-In: I83dbaa24f94f5cca846d6ca71c7e6814ecd832b8
2020-03-16 05:48:10 +00:00
zoey chen
4fdc013e04 [TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed
Test: make
Bug: 146107006
Change-Id: I62a0249a1462c9e8d71552e2304642eb6bde3eb5
Merged-In: I62a0249a1462c9e8d71552e2304642eb6bde3eb5
2020-03-16 13:14:27 +08:00
Alex Lin
2c3cc82819 Update EuiccService encodeSmdxSubjectAndReasonCode
Update the method signature of encoding subject code and reasoncode
Bug: 149216056
Test: atest EuiccService

Change-Id: Ifb9c1a11f48e191f7d49384946f9fd78d81b84dc
Merged-In: Ifb9c1a11f48e191f7d49384946f9fd78d81b84dc
2020-03-13 18:32:52 -07:00
Alex Lin
4888d9aca2 Rename ErrorCode
Renamed ErrorCode from ERROR_EUICC_GSMA_INSTALL_ERROR to
ERROR_INSTALL_PROFILE, and updated javadocs
Bug: 143107744
Test: atest EuiccManagerTest

Change-Id: I3c2dcd2ff4d3d037997c6fee6278ffd706671d3f
Merged-In: I3c2dcd2ff4d3d037997c6fee6278ffd706671d3f
2020-03-13 18:25:14 -07:00
Alex Lin
e61b636a61 Add public error codes to Euicc public API
Adding public error codes to euicc public API, this will allows the user
to get an general idea of what went wrong when calling the Euicc APIs
Bug: 143107744
Test: atest EuiccService, atest EuiccManager

Change-Id: I427f17e8f28fa4a646a63299a1f63c4c5970a5a0
Merged-In: I427f17e8f28fa4a646a63299a1f63c4c5970a5a0
2020-03-13 18:25:14 -07:00
Daniel Bright
127fd8d6e8 Merge "Rollback SystemApis for Mainline" 2020-03-13 21:36:43 +00:00
Treehugger Robot
f36f5590ac Merge "Rollback @SystemApi on ApnSetting" 2020-03-13 20:58:11 +00:00
Malcolm Chen
de9182c01f Make createLocationInfoSanitizedCopy as @hide.
As we are not shipping Telephony mainline and it's TBD whether
TelephonyRegistry will be part of mainline or not, we change
createLocationInfoSanitizedCopy from @SystemApi back to @hide.

Bug: 148179832
Test: build
Change-Id: I65dea196ab80aec96b6b35edcc0059cefc2f1b43
Merged-In: I65dea196ab80aec96b6b35edcc0059cefc2f1b43
2020-03-13 20:38:16 +00:00
Xiangyu/Malcolm Chen
deb27cc388 Merge "Re-order parameters of setUiccApplicationsEnabled." 2020-03-13 20:38:06 +00:00
Xiangyu/Malcolm Chen
aafea7546b Merge "Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED." 2020-03-13 18:18:48 +00:00
Treehugger Robot
cbfaae4f0c Merge "Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis" 2020-03-13 14:04:40 +00:00
Rambo Wang
88d585becf Merge "CellularDataService: mCallbackMap is not thread safe" 2020-03-13 05:06:05 +00:00
SongFerng Wang
8b3f684395 Merge "[Mainline] Add @hide. Revisit and redesign in S" 2020-03-13 04:22:33 +00:00
Malcolm Chen
55d7950641 Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED.
According to API council review.

Bug: 142715546
Test: build
Change-Id: I7c95b175865986901cf50e21b39a35df60ada83e
Merged-In: I7c95b175865986901cf50e21b39a35df60ada83e
2020-03-13 04:16:47 +00:00
Treehugger Robot
247ae0dc5c Merge "5G icon default changed" 2020-03-13 00:55:37 +00:00