Commit Graph

4109 Commits

Author SHA1 Message Date
Automerger Merge Worker
f01f6aec2f Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23
Change-Id: If317967b103c8b797a74b089c13b518c33b60465
2020-01-15 03:24:56 +00:00
Allen Su
b498fbf860 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" 2020-01-15 02:42:27 +00:00
Automerger Merge Worker
b74675a238 Merge changes Iec082f0c,I86a479af am: 52cc4a4321 am: 30a1749f8e
Change-Id: Ibf943b652da9c94aedd8c58952cf84b90e7bdca2
2020-01-14 19:21:07 +00:00
Automerger Merge Worker
f30c746b69 Merge "Add new @SystemApis for RCS dependencies" am: 6408fa473f am: dd840cdaae
Change-Id: I307990e1b794a659b5110406794ba927d223be86
2020-01-14 18:17:11 +00:00
Meng Wang
52cc4a4321 Merge changes Iec082f0c,I86a479af
* changes:
  telephony/common/* should use android.util.Log
  Use com.android.telephony.Rlog for mainline module.
2020-01-14 18:06:22 +00:00
Brad Ebinger
6408fa473f Merge "Add new @SystemApis for RCS dependencies" 2020-01-14 17:31:36 +00:00
allenwtsu
f7ce51f9cf [RCS] Implement notifyRcsAutoConfigurationReceived()
Bug: 147122370
Test: build pass
Change-Id: I239c53806b148e899d8078c469731f05e8b97885
2020-01-14 14:30:01 +08:00
Automerger Merge Worker
0a235b9416 Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" am: b1c730d069 am: a2d0828670
Change-Id: I8ad4301faeded70e3d298088816fc72b75b4bc2e
2020-01-13 23:22:01 +00:00
Allen Su
b1c730d069 Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" 2020-01-13 23:15:14 +00:00
Brad Ebinger
10327316a9 Add new @SystemApis for RCS dependencies
As part of mainline, remove telephony dependencies from RcsService
and PresencePolling apps.

Bug: 147319232
Test: atest CtsTelephonyTestCases
Merged-in: Id25bfffc1c40db8b183206dc598165272da7356c
Change-Id: Id25bfffc1c40db8b183206dc598165272da7356c
2020-01-13 13:38:07 -08:00
Automerger Merge Worker
8d2f9806c7 Merge "Add Callback for Registration Failure" am: 93db49faec am: 5532d79f90
Change-Id: I5e6e2b3b41b24e6122963644633d63d14e8a7605
2020-01-13 21:24:06 +00:00
Treehugger Robot
93db49faec Merge "Add Callback for Registration Failure" 2020-01-13 20:58:00 +00:00
Meng Wang
6d3e821058 Use com.android.telephony.Rlog for mainline module.
Bug: 144374158
Test: make
Merged-In: I86a479affb8e0fa8e48734324a6a05c68230d910
Change-Id: I86a479affb8e0fa8e48734324a6a05c68230d910
2020-01-13 10:32:55 -08:00
Automerger Merge Worker
dea27d3676 Merge "[Telephony Mainline] Add new api for Mvno matching" am: 2d83e92bbd am: dc4bd96c79
Change-Id: Iccb0bbb7247fba66348b488894de01717bd9254a
2020-01-13 17:23:02 +00:00
Calvin Pan
2d83e92bbd Merge "[Telephony Mainline] Add new api for Mvno matching" 2020-01-13 16:54:50 +00:00
Automerger Merge Worker
62dba7a4e6 Merge "Use new UnsupportedAppUsage annotation." am: b2c3eaaf10 am: 904b7f9de2
Change-Id: I62868fbcba5ffd65a441808e2a0cda59c9597654
2020-01-13 14:37:21 +00:00
Treehugger Robot
b2c3eaaf10 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 14:27:29 +00:00
changbetty
9ec425857c [Telephony Mainline] Add new api for Mvno matching
Bug: 144977430
Test: make
Change-Id: I550e93ab8662c81068a6d52fef2e3c299607c18f
Merged-In: I550e93ab8662c81068a6d52fef2e3c299607c18f
2020-01-13 05:01:44 +00:00
Nathan Harold
c41cb737ed Add Callback for Registration Failure
Add a callback to PhoneStateListener to indicate that
a registration procedure has failed.

Bug: 143187047
Test: make update-api && make
Merged-In: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
Change-Id: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
(cherry picked from commit 5e6e983cad)
2020-01-12 10:33:03 -08:00
Automerger Merge Worker
df1499d027 Merge "Add a copy of Rlog for the telephony mainline module" am: 00fe08f5bf am: 9fc52ab1fc
Change-Id: I6cb1ffe87de13320e7ac166e9392ecdc59f8027c
2020-01-10 22:20:16 +00:00
Meng Wang
00fe08f5bf Merge "Add a copy of Rlog for the telephony mainline module" 2020-01-10 22:05:03 +00:00
Automerger Merge Worker
ab6c0737f9 Merge changes from topic "146593004" am: 3863c17fd2 am: acf7918f60
Change-Id: I49421bb2304df82c44e6c8204b9f89fb843590b9
2020-01-10 19:24:39 +00:00
Makoto Onuki
eba9902300 Add a copy of Rlog for the telephony mainline module
Bug: 144374158
Test: boot
Merged-In: I5be0497a17d00152286fe3351bf58e75b675ceb6
Change-Id: I5be0497a17d00152286fe3351bf58e75b675ceb6
(cherry picked from commit 57e56f2d3c)
2020-01-10 11:05:43 -08:00
Xiangyu/Malcolm Chen
3863c17fd2 Merge changes from topic "146593004"
* changes:
  Remove usage of @hide @Deprecated Telephony API in NPMS
  Use proper Telephony API to supply sim pin and puk.
  Hook supplyPin and supplyPuk to proper impl with subId specified
2020-01-10 18:53:42 +00:00
Sarah Chin
0262cb7765 Merge "5G meteredness for telephony framework" 2020-01-10 16:36:48 +00:00
Sarah Chin
325287407f 5G meteredness for telephony framework
Added networkTypes to SubscriptionPlan
Send SubscriptionPlans as dispatch via listener
Updated API for R

Bug: 139070884
Test: atest FrameworksTelephonyTests
Test: atest cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
Change-Id: Idb67fb7676adf9e1158113e7b8b08e655f470920
Merged-In: Idb67fb7676adf9e1158113e7b8b08e655f470920
(cherry-pick from ag/9459941)
2020-01-09 22:48:59 -08:00
Automerger Merge Worker
a6110193f8 Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." am: 9bda007cb8 am: a881005317
Change-Id: I14834c28abb17cdc0397950470e45f4e73462dff
2020-01-10 04:46:53 +00:00
Meng Wang
9bda007cb8 Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." 2020-01-10 04:25:45 +00:00
Sarah Chin
80b73b9e1c 5G meteredness for telephony framework
Added networkTypes to SubscriptionPlan
Send SubscriptionPlans as dispatch via listener
Updated API for R

Bug: 139070884
Test: atest FrameworksTelephonyTests
Test: atest cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
Change-Id: Idb67fb7676adf9e1158113e7b8b08e655f470920
Merged-In: Idb67fb7676adf9e1158113e7b8b08e655f470920
(cherry-pick from ag/9459941)
2020-01-09 19:45:14 +00:00
Artur Satayev
54af4fc42a Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I547d7fb2e6bc2e9707bbc0d14dc1e8cd632c5a23
Merged-In: I547d7fb2e6bc2e9707bbc0d14dc1e8cd632c5a23
2020-01-09 13:52:18 +00:00
Sarah Chin
df94694c42 Merge "Handle 5G meteredness in telephony framework" 2020-01-09 05:03:24 +00:00
Meng Wang
8af4d4ad78 Use Parcelable CellIdentity instead of CellLocation in AIDL.
Currently CellLocation is passed over AIDL by manually
marshalling/unmarshalling to/from Bundle, and type info
is not preserved in the process.

Bug: 146092124
Test: make
Merged-In: I6225f100953a2ad354acaa261a774989926393ce
Change-Id: I6225f100953a2ad354acaa261a774989926393ce
2020-01-08 20:29:27 -08:00
Automerger Merge Worker
e576ba8f8d Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" am: 0104ce5293 am: f5a037d685
Change-Id: I09813d60dacabbd98e395816f9d7cb6d965a4f19
2020-01-09 03:45:21 +00:00
Treehugger Robot
0104ce5293 Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" 2020-01-09 02:48:14 +00:00
Sarah Chin
0b7efca5e6 Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp 2020-01-09 02:23:13 +00:00
Sarah Chin
1431ab2ee5 Handle 5G meteredness in telephony framework
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
Merged-In: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
(cherry-picked from ag/9302701)
2020-01-09 02:13:47 +00:00
Sarah Chin
e8aa5acef5 Handle 5G meteredness in telephony framework
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
Merged-In: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
(cherry-picked from ag/9302701)
2020-01-09 02:13:26 +00:00
Automerger Merge Worker
5bf20b018c Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" am: 24a3f6a6cd am: 1430e17814
Change-Id: I383cb9d0462d9bc9574769210532e4988965fff0
2020-01-09 00:22:22 +00:00
Automerger Merge Worker
4d4abe7a8f Expose setUiccApplicationsEnabled as @SystemApi for eSIM to call upon slot mapping change. am: 4ece3db113 am: cd6845de02
Change-Id: I2ccf309efd24c561cf35d8e54a139d84250d2746
2020-01-09 00:21:32 +00:00
Peter Wang
24a3f6a6cd Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" 2020-01-08 23:58:23 +00:00
Philip P. Moltmann
06b07e9e25 (Backport) Pipe through featureId from caller to permission checks in telephony
code

Test: atest FrameworksTelephonyTests CtsAppOpsTestCases
Bug: 136595429
Fixes: 146350559
Change-Id: Ie58007cf2a4e4a39cdfd72822150efce71dfbe84
Merged-In: I7ef41e8961e48d40e5685c4a521e83cb20953e48
2020-01-08 14:16:54 -08:00
Malcolm Chen
893f393125 Hook supplyPin and supplyPuk to proper impl with subId specified
All TelephonyManager APIs are subId specified, where the public  API call
should map to a subId specific implementation via ITelephony and
PhoneInterfaceManager. But that's not the case for supplyPin and
supplyPuk. So fixing it and clean up unused aidl calls.

Bug: 146593004
Test: manual - pin and puk
Change-Id: If496674ef2ddc608264cf7b12905614698dc7e2d
Merged-In: If496674ef2ddc608264cf7b12905614698dc7e2d
2020-01-08 14:06:13 -08:00
Malcolm Chen
4ece3db113 Expose setUiccApplicationsEnabled as @SystemApi for eSIM to call upon slot
mapping change.

Because currently we rely on eSIM module to do handle some slot mapping
change and single to dual SIM config change, eSIM needs to also make
sure uicc applications are enabled for certain scenarios. So we expose
the SubscriptionManager#setUiccApplicationsEnabled as @SystemApi

Bug: 141018421
Test: unittest
Change-Id: I9844e71260ea009afd0928a0f4be4426e7d12358
Merged-In: I9844e71260ea009afd0928a0f4be4426e7d12358
2020-01-08 13:56:27 -08:00
Peter Wang
3d292322b9 [Telephony Mainline] Move TelephonyUtils to telephony/common
Bug: 140908357
Test: Build
Change-Id: I94764fcf698477285ea366c5c7e90e7bd8a27eb3
Merged-In: I94764fcf698477285ea366c5c7e90e7bd8a27eb3
2020-01-08 13:41:38 -08:00
allenwtsu
c2524a47ad [RCS] Add set/getRcsProvisioningStatusForCapability()
Bug: 147122370
Test: build pass
Change-Id: I403df7a2e58bca0be7e459b39e944833f9f0f792
2020-01-08 20:09:50 +08:00
Automerger Merge Worker
0d5314922c Merge "[Telephony Mainline] Move CarrierAppUtils and LocationAccessPolicy to telephony common" am: 18077c1587 am: 85ba19fa5f
Change-Id: Ia47ac5e4128943dbf369b4f8c5e21aa503f6b67d
2020-01-07 23:09:43 +00:00
Peter Wang
18077c1587 Merge "[Telephony Mainline] Move CarrierAppUtils and LocationAccessPolicy to telephony common" 2020-01-07 22:59:17 +00:00
Automerger Merge Worker
626ceae57e Merge "Remove unused broadcast DATA_CONNECTION_FAILED" am: d8836ba33f am: 2d9062cc48
Change-Id: Ic6046fc883372c42fd95886b143c1661b027cf6e
2020-01-07 20:31:13 +00:00
Meng Wang
d8836ba33f Merge "Remove unused broadcast DATA_CONNECTION_FAILED" 2020-01-07 19:59:36 +00:00
Automerger Merge Worker
3ac69fd2b8 Merge "Do not use hidden HandlerExecutor" am: 166c8761a4 am: 2072de8ff8
Change-Id: Ic4710704a12bd0bc061d26390199355ed926557c
2020-01-07 18:55:38 +00:00