Commit Graph

11291 Commits

Author SHA1 Message Date
Nathan Harold
d1febb827b Merge changes from topics "barring-cp", "nri-rplmn" am: 2ea0b56cff am: 222c446e82
Change-Id: If53641531005a372bebda32790cc11b8e140c7c6
2020-03-19 00:29:45 +00:00
Nathan Harold
91885ada76 Return the RPLMN from NetworkRegistrationInfo am: ad4d8569e7 am: 5520865885
Change-Id: Ic7eb9686e4538234232199f77a4af2b96ea3f1a3
2020-03-19 00:29:42 +00:00
Nathan Harold
23cff81367 Expose PreciseDataConnectionstate#getApnSetting() am: ca2e76571e am: 75016e61d4
Change-Id: I14b5a04d30b59ae6054012a6211aa7eeeac4e1da
2020-03-19 00:29:39 +00:00
Nathan Harold
672e4b4006 Skip sanitizing location info for Null Barring CID am: b41802887f am: e7a87a7b8a
Change-Id: I1961d217150a9803df7564fb884ed7f612e33b05
2020-03-19 00:29:37 +00:00
Nathan Harold
c14c4ed993 Remove BarringInfo#isServiceBarred() am: e3adb3a0a6 am: 15b304a1be
Change-Id: I1d9b64bad100d2770b06cf42eb20b82ccff66450
2020-03-19 00:29:34 +00:00
Rambo Wang
88a89cc7aa Introduce a new RIL request constant to support getBarringInfo. am: ca33ed2d7e am: 143fe10060
Change-Id: I2580548ec6a666c99a645c5f9dc72e3823324565
2020-03-19 00:29:32 +00:00
Rambo Wang
94ac2d3e5e Update BarringInfo as Barring HAL date stuctures updated am: 2251158835 am: 36809febde
Change-Id: Ib72c7280d2aaf6d1419026df49d5ed37cb7b8b58
2020-03-19 00:29:25 +00:00
Nathan Harold
27b5ab5a16 Add a BARRING_TYPE_UNKNOWN for Unreported Barring am: 3c5e57cd07 am: 5fa0fade08
Change-Id: Ia2bce23a061f0d7a0e037d7c710915ffbe16ba44
2020-03-19 00:29:22 +00:00
Nathan Harold
07ebcf5f74 Add Callback to notify changes of barring status am: 61b5d6741b am: ae39e7a551
Change-Id: I1ef45afe49795a67174be86284a20aea2f080fd5
2020-03-19 00:29:19 +00:00
Nathan Harold
5520865885 Return the RPLMN from NetworkRegistrationInfo am: ad4d8569e7
Change-Id: I668ecefe0ae5e441d00a06392ecdc8388ad59edb
2020-03-19 00:08:51 +00:00
Nathan Harold
75016e61d4 Expose PreciseDataConnectionstate#getApnSetting() am: ca2e76571e
Change-Id: I2798fdb8d643fcd2abb4352335873b39c2b6e539
2020-03-19 00:08:48 +00:00
Nathan Harold
e7a87a7b8a Skip sanitizing location info for Null Barring CID am: b41802887f
Change-Id: I797eab4212793d1feb5fa4723bc3f2b9a93962ef
2020-03-19 00:08:46 +00:00
Nathan Harold
15b304a1be Remove BarringInfo#isServiceBarred() am: e3adb3a0a6
Change-Id: I4bfffa6b4e06bc361e2da222b2f25d6ddc32b7aa
2020-03-19 00:08:41 +00:00
Rambo Wang
143fe10060 Introduce a new RIL request constant to support getBarringInfo. am: ca33ed2d7e
Change-Id: I50ba0b4e145aac84b6c1de6c5a240ced488fb057
2020-03-19 00:08:38 +00:00
Rambo Wang
36809febde Update BarringInfo as Barring HAL date stuctures updated am: 2251158835
Change-Id: I4df420ae5324fd89180e09a851b9b8ebeea555bb
2020-03-19 00:08:35 +00:00
Nathan Harold
5fa0fade08 Add a BARRING_TYPE_UNKNOWN for Unreported Barring am: 3c5e57cd07
Change-Id: I4bca54225edde80df0c5e587a3f0f753bded393d
2020-03-19 00:08:30 +00:00
Nathan Harold
ae39e7a551 Add Callback to notify changes of barring status am: 61b5d6741b
Change-Id: Ib306f821c9f37a5f4c3df39ed75386768f8c9160
2020-03-19 00:08:24 +00: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
eba9f36618 Merge "Ims: Add <RETRY_CALL_FAIL_REASON> and <RETRY_CALL_FAIL_NETWORK> extras" am: 7db4916a40 am: b8edd3ffd3
Change-Id: Ifb1373bf4f88357cb94bb49633c792b3e7ce57fa
2020-03-18 21:50:36 +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
Shuo Qian
e56e9d7dcc Merge "API Council Feedbacks" am: c4243e05d0 am: 5ece852ca1
Change-Id: I640798a2cd22f0144684b66db7998522e6f19019
2020-03-18 20:26:11 +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
6c3c8ce4a0 Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock" am: 685fe6f443 am: 66d77f04d8
Change-Id: I18f7efef77595403a99c4d18ca0006702076059f
2020-03-18 05:37:52 +00: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
09c0c270e5 Update EuiccService encodeSmdxSubjectAndReasonCode am: 2c3cc82819 am: 1fb2e3e4fc
Change-Id: I9e911b92f6543717b16ef495d1158f80f2d4ceee
2020-03-17 23:49:38 +00:00
Alex Lin
ef11335d44 Rename ErrorCode am: 4888d9aca2 am: d6e6578aab
Change-Id: I75061d1d1b2e20b5039e3b08eedc1bb1ed208397
2020-03-17 23:49:33 +00:00
Alex Lin
c756fbef55 Add public error codes to Euicc public API am: e61b636a61 am: abba583f62
Change-Id: I3dc973cca08aafa757b8743155cffb127578d414
2020-03-17 23:49:31 +00:00
Alex Lin
1fb2e3e4fc Update EuiccService encodeSmdxSubjectAndReasonCode am: 2c3cc82819
Change-Id: I5a8c7c0e088a01755f67a1f20d1b5a92caadfb66
2020-03-17 23:20:11 +00:00
Alex Lin
d6e6578aab Rename ErrorCode am: 4888d9aca2
Change-Id: Ib3c4e0732359196bd3fdf15a88c71a328d8c85cd
2020-03-17 23:20:02 +00:00
Alex Lin
abba583f62 Add public error codes to Euicc public API am: e61b636a61
Change-Id: I92af20dde36ebdeb00cabaa2558351293ec9c1d1
2020-03-17 23:19:53 +00: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
1d285f1724 Merge "Revert "Fix permission check for get/setSmscAddress."" am: c070b1de57 am: ae274c92ae
Change-Id: Id2df596c8a4c2abe4a74938a0dc5656d1f27a70e
2020-03-17 22:10:33 +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
Automerger Merge Worker
b07150a1a1 Merge "upperLayerIndicator_r15 is optional, nr state design changed" am: 0737c31dac am: e595809c46
Change-Id: I6ceaef3008121d62af312aafe28f831d020d352d
2020-03-17 08:44:17 +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
Automerger Merge Worker
10beedfc64 Merge "Removed permission check" am: d5848b795d am: 3e2c2b3293
Change-Id: I9fafee149f9893bd170b0615d6a3e7e852bef7c3
2020-03-17 04:04:54 +00:00
Jack Yu
d5848b795d Merge "Removed permission check" 2020-03-17 03:15:32 +00:00
Automerger Merge Worker
aab877c826 Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" am: 1724914c9f am: 42f970358d
Change-Id: Iae0947c1317624195dce58a609e94dae19f1222c
2020-03-17 03:06:07 +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