16628 Commits

Author SHA1 Message Date
Jack Yu
2f0440e4fe Merge "Updated the owners" am: c22f798040 am: d7659e6014 am: 0d9d376b45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052239

Change-Id: I2b0f3ca4b76ca656dde769ae1b26a9fe6a83d870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 06:06:57 +00:00
Jack Yu
c22f798040 Merge "Updated the owners" 2022-04-04 05:22:30 +00:00
TreeHugger Robot
f8e43432fd Merge "Fix include location data to check for coarse location first." into tm-dev 2022-04-01 23:28:35 +00:00
Ling Ma
8827b92855 Merge changes from topic "truncate operator name" am: ffa0f982b6 am: 9cf73e369d am: eb897b1d85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004810

Change-Id: Ie1a67a1a9fae4dbbc321755f7ec9bde8bb84613f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:54:46 +00:00
Ling Ma
ffa0f982b6 Merge changes from topic "truncate operator name"
* changes:
  Truncate operator name to fit into SystemProp size
  Add truncateStringForUtf8Storage()
2022-04-01 21:43:23 +00:00
Treehugger Robot
bdf20659d3 Merge "Added command line tool to enable/disable new data stack" 2022-04-01 20:40:00 +00:00
Rafael Higuera Silva
ce7867d377 Fix include location data to check for coarse location first.
Bug: 222766399
Test: make, atest TelephonyLocationTests, manual
Change-Id: Id277d16aceb58324ec70eadfcd3fb871821707c9
Merged-In: Id277d16aceb58324ec70eadfcd3fb871821707c9
(cherry picked from commit 22ca59c42b52d8b8c02429cfbc4717bb55a58fda)
2022-04-01 19:39:55 +00:00
Jack Yu
b6512b4ead Added command line tool to enable/disable new data stack
Provide the temporary command line tool to check whether new
data stack is enabled or not.

Bug: 196597630
Test: adb shell cmd phone get-data-mode
Change-Id: I9f95e7424e6e74af12a0f6780a58fb5732df7300
Merged-In: I9f95e7424e6e74af12a0f6780a58fb5732df7300
2022-04-01 10:55:48 -07:00
Jack Yu
7750d9fa9f Updated the owners
Updated the owners to the latest telephony and
telecomm team members.

Test: Build
Bug: None
Change-Id: I3a456b168ec24199413e42c5fa615ecf285af79b
2022-04-01 16:46:46 +00:00
Ling Ma
d985d0a3fe Add PROTOCOL_UNKOWN
Test: build
Bug: 217375910
Merged-In: I5bd0351925d27bb2178d4cd0cc93197f463236cd
Change-Id: I5bd0351925d27bb2178d4cd0cc93197f463236cd
2022-04-01 09:40:49 -07:00
Sarah Chin
30eec56eac Merge "SetDataEnabled indicate calling package" into tm-dev 2022-04-01 16:07:46 +00:00
Sarah Chin
ac94df2bab SetDataEnabled indicate calling package
Test: atest TelephonyManagerTest
Bug: 226149142
Change-Id: I769437e9332f27c0990c37f60ad6d9db284e86cf
2022-03-31 21:15:05 -07:00
Ling Ma
c901b0b863 Truncate operator name to fit into SystemProp size
Test: manual
Bug: 210502588
Change-Id: I59a87fa256a9be54755199034e138a63d89f0885
2022-04-01 02:24:22 +00:00
Sooraj Sasindran
d91b8125f3 rename renounce fine location data
rename renounce fine location data to include location data

Bug: 210923726
Test: cts
Merged-In: Ic2ce84f51bf394031903ae180788216cfa910fc0
Change-Id: Ic2ce84f51bf394031903ae180788216cfa910fc0
2022-03-31 20:15:20 +00:00
Ling Ma
da11a0da69 Update handover rule java doc
Change-Id: I784ac4b58ea64baf90ec7faf7a25dda5cd1c31cc
Merged-In: I784ac4b58ea64baf90ec7faf7a25dda5cd1c31cc
Test: atest
Bug: 222018690
2022-03-30 10:17:55 -07:00
Sandeep Jawalkar
29571eb054 Merge "Adding comments to the to-be deprecated SubscriptionManager#switchToSubscription" into tm-dev 2022-03-30 12:14:56 +00:00
TreeHugger Robot
82c6e424d2 Merge "Align the RecoveryActions between DataStallRecoveryManager and Westworld" into tm-dev 2022-03-30 04:56:43 +00:00
Allen Xu
4797e99e5f Merge "Support PersistableBundle type config values in getConfigByComponentForSubId" 2022-03-29 18:33:04 +00:00
Nathan Harold
5f5ab5a727 Merge "Add Applicability Language to Usage Settings" into tm-dev 2022-03-29 01:36:12 +00:00
sandeepjs
b061a76e95 Adding comments to the to-be deprecated
SubscriptionManager#switchToSubscription

this API directly calls EuiccManager#switchToSubscription which is a
public API, it also send information without port which is incomplete
informationto MEP Activated device.

Test: build
Bug:226388098

Change-Id: Ica998f8209bd7aa6948c157bb0ace0f96876451c
2022-03-28 21:17:11 +00:00
Muralidhar Reddy
2c59155cf6 [MEP] EuiccManager API modifications to support carrier apps
Remove deprecated tag from switchToSubscription API. Partially reverts the changes to switchToSubscription API with ag/16232869

Bug: 214055002
Test: manual, atest FrameworksTelephonyTests
Change-Id: I6a802ea0c85ff749b09745f629bc1a80f30ed3b9
Merged-In: I6a802ea0c85ff749b09745f629bc1a80f30ed3b9
2022-03-28 10:24:01 -07:00
Muralidhar Reddy
286db29cf7 [MEP] Add port index in SubscriptionInfo database
Bug: 199559346
Test: build, manual
Change-Id: Ia74d5e8714fc961f2d22c104683d3e8722deaa3d
Merged-In: Ia74d5e8714fc961f2d22c104683d3e8722deaa3d
2022-03-28 10:23:34 -07:00
Willy Hu
c20021e1c8 Align the RecoveryActions between DataStallRecoveryManager and Westworld
- Add one more item for recovery action re-register
- Set the default value to true to skip the recovery action re-register in Android T

Bug: 214662910
Test: atest DataStallRecoveryManagerTest
Change-Id: Ibc5c2daa8cbf88dc8c626b12817a544a5a5c8e82
2022-03-29 00:05:26 +08:00
Chen Xu
523145c415 Merge "Do not resolve port index for apps not targeting SDK T and beyond" into tm-dev 2022-03-28 05:09:48 +00:00
Sarah Chin
49f7901033 Merge changes from topic "pendingIntent-switchToSub"
* changes:
  Make switchToSubscription use PendingIntent
  Do not use portIndex API until implemented
2022-03-28 04:58:54 +00:00
Jack Yu
d3afcd858b Document the QNS behavior
Clearly defined the QNS behavior to avoid
ambiguity.

Bug: 226267529
Test: atest AccessNetworksManagerTest
Change-Id: I274d88338ac4f15a4458e035af0e5c0b278f9c1b
2022-03-26 00:53:48 +00:00
Jack Yu
5f601c4acb Partially revert ag/17294635
The qualified network service change was accidentally
merged in ag/17294635. It should be merged in a different
CL. Revert back to the previous version.

Bug: 171809764
Test: Build
Change-Id: Id50e376c04141a347ff70cdc7ab7ad1fab661844
2022-03-26 00:53:35 +00:00
Allen Xu
d91981bfef Support PersistableBundle type config values in getConfigByComponentForSubId
PersistableBundle support is required to enable better handling of more
complex carrier configurations.

Bug: 223443016
Test: make, atest CarrierConfigManagerTest
Merged-In: Idb564cf44d7d321b95cccb18798992e718f30da4
Change-Id: I94f581acc4cc7a7de39958e598e845831f81aab9
2022-03-25 22:32:38 +00:00
Nathan Harold
b36dcb00e4 Add Applicability Language to Usage Settings
In order to ensure that the API contract is clear, move some
language from proposed CDD language onto the actual API surface
itself to clarify when various usage settings need to be supported.

Bug: 225950273
Test: make offline-sdk-docs (docstring only changes)
Change-Id: Idee297aaf7ac3af7f5fb86d85d806da13011c036
2022-03-25 13:51:55 -07:00
Baligh Uddin
f5db132e49 Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev 2022-03-25 13:12:10 +00:00
TreeHugger Robot
48709c6565 Merge "Utilize specific info provided by the Modem HAL" into tm-dev 2022-03-24 22:21:56 +00:00
Jordan Liu
611c9e39d5 Make switchToSubscription use PendingIntent
Bug: 205504646
Test: manual
Change-Id: Ieec385ee6b054d2c6392c4a45eb501eb876cdd0a
Merged-In: Ieec385ee6b054d2c6392c4a45eb501eb876cdd0a
2022-03-24 13:01:56 -07:00
Jordan Liu
b4fb360929 Do not use portIndex API until implemented
Bug: 207384656
Bug: 207392528
Test: manual
Change-Id: Ief7a17a40abfc91447f5fdc669a263cd2c198ad7
Merged-In: Ief7a17a40abfc91447f5fdc669a263cd2c198ad7
2022-03-24 13:01:28 -07:00
Rambo Wang
d25623ae62 Merge "Clear up CarrierPrivilegesListener APIs" 2022-03-24 19:48:30 +00:00
Roopa Sattiraju
a574076442 Changing apk name in the manifest and the corresponding packages.
BUG: 226403247
Test: TH
Change-Id: I23f5b34dd6d3d272e1d5488849ebb428a6cc2a90
2022-03-24 10:32:15 -07:00
Michael Wachenschwanz
adfc51a554 Utilize specific info provided by the Modem HAL
ModemActivityInfo can now include Radio Access Technology specific information, if the HAL supports it.
If available, utilize the information.

Bug: 207697945
Test: atest BatteryStatsNoteTest
Change-Id: Ifbd3c8cca7baa35cbccf64883ae5ce87ae39ab74
2022-03-23 18:37:50 -07:00
Chen Xu
d9e8a4f5ff Merge "Add portIndex for switch subscription API" 2022-03-23 22:51:40 +00:00
Rambo Wang
e72e4ca85b Merge "[MEP] adding portindex to sim access APIs" 2022-03-23 21:42:56 +00:00
Rambo Wang
0aff5099d5 Clear up CarrierPrivilegesListener APIs
CarrierPrivilegesListener has been replaced with
CarrierPrivilegesCallback. With all clients has been migrated, it is
time to remove the obsoleted APIs

Bug: 216549778
Test: atest CarrierPrivilegesTrackerTest CarrierServiceTest
Test: atest WifiCarrierInfoManagerTest TelephonyRegistryManagerTest
Test: atest TelephonySubscriptionTrackerTest
Change-Id: I89df21764d3b9945219d810d0dd9bfe3cf5fbea4
Merged-In: I89df21764d3b9945219d810d0dd9bfe3cf5fbea4
(cherry picked from commit 5a4bcc0a9c1f656bd87e2830e56dea37197fdd2b)
2022-03-23 14:30:43 -07:00
Rambo Wang
5a4bcc0a9c Clear up CarrierPrivilegesListener APIs
CarrierPrivilegesListener has been replaced with
CarrierPrivilegesCallback. With all clients has been migrated, it is
time to remove the obsoleted APIs

Bug: 216549778
Test: atest CarrierPrivilegesTrackerTest CarrierServiceTest
Test: atest WifiCarrierInfoManagerTest TelephonyRegistryManagerTest
Test: atest TelephonySubscriptionTrackerTest
Change-Id: I89df21764d3b9945219d810d0dd9bfe3cf5fbea4
2022-03-23 10:04:41 -07:00
Rambo Wang
476574dfc8 Optimize TM#getCarrierServicePackageName[ForLogicalSlot]
Instead of querying package manager every time which is
quite expensive, the new implementation will improve
the performance by query the cache in CarrierPrivilegesTracker.

Bug: 217442920
Test: atest CarrierPrivilegesTrackerTest
Change-Id: I29df8599bdfc84cab330fa7056a228997a4bac0f
Merged-In: I29df8599bdfc84cab330fa7056a228997a4bac0f
(cherry picked from commit 28b2ee8ec0314c1f77d92017de24c0d3df003aff)
2022-03-23 08:11:30 -07:00
Rambo Wang
cabb6b9362 Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" 2022-03-23 13:44:09 +00:00
Virkumar Karavate
1283caacb6 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39d1 am: b646fcd689 am: 9723c61343
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036103

Change-Id: Ic5d77ad3026b4fc4a960e33f15d2f4872a776f61
2022-03-23 12:47:02 +00:00
Virkumar Karavate
14087b39d1 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" 2022-03-23 11:58:56 +00:00
Rambo Wang
aa1e3b0a67 Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener
Add new interface in CarrierPrivilegesCallback to notify the registrants
that carrier service for current user has changed.

Reshape the parameters of onCarrierPrivilegesChanged callback with
both Set instead of List/Array.

CarrierPrivilegesListener is deprecated. Once all clients have migrated
to CarrierPrivilegesCallback, it will be throughly cleaned up.

Bug: 216549778
Test: atest CarrierPrivilegesTrackerTest CarrierServiceTest
Test: atest WifiCarrierInfoManagerTest TelephonyRegistryManagerTest
Test: atest TelephonySubscriptionTrackerTest

Change-Id: I18e443d91f1db951f1461511821c0f5f673da3a3
Merged-In: I38d03e3921112c313f3c1d204ed04f6e1756ff39
(cherry picked from commit b66e3e3aa87395069833307716334ff577b778a7)
2022-03-22 20:45:05 -07:00
Sarah Chin
0da25d0cb0 Merge "Remove RESULT_ERROR_INVALID_RESPONSE" into tm-dev 2022-03-23 02:57:07 +00:00
sandeepjs
f9935cec48 [MEP] adding portindex to sim access APIs
Updated sim access API's with portIndex.
Test: atest TelephonyManagerTest#testIccOpenLogicalChannelBySlotAndPort
Test: atest TelephonyManagerTest#testIccCloseLogicalChannelBySlotAndPort
Test: atest
TelephonyManagerTest#testIccTransmitApduLogicalChannelBySlotAndPort
Test: atest
TelephonyManagerTest#testIccTransmitApduBasicChannelBySlotAndPort
Bug: 208739934

Change-Id: I32fc94f2fe98c46d8bb0120fff49e5b72df27ddf
Merged-In: I32fc94f2fe98c46d8bb0120fff49e5b72df27ddf
2022-03-23 02:56:15 +00:00
Jordan Liu
abedec1601 Add portIndex for switch subscription API
Bug: 205504646
Test: manual (builds, will not be functional until LPA implementation)
Change-Id: Ic289538f5df17c03b2f8da7f4966c583d4557586
Merged-in: Ic289538f5df17c03b2f8da7f4966c583d4557586
2022-03-22 19:26:58 -07:00
Sarah Chin
0a5cb27877 Remove RESULT_ERROR_INVALID_RESPONSE
Errors will send with RESULT_ERROR_ILLEGAL_STATE instead

Test: manual
Bug: 224832687
Change-Id: I6adb5043d10a4d9512ea5ee5d625f1c71d14f6d5
2022-03-22 13:17:18 -07:00
Rambo Wang
d079ef5d72 Merge "Update the javadoc of TM#addCarrierPrivilegesListener" into tm-dev 2022-03-22 19:52:55 +00:00