Commit Graph

4281 Commits

Author SHA1 Message Date
Daniel Bright
f16dc0708a Merge "Rewriting phone constants for mainline" 2020-01-14 21:14:35 +00:00
Daniel Bright
4bcbfce5fc Rewriting phone constants for mainline
* Exposing Emergency extra constants through TelephonyManager
* Always reading or writing PhoneConstants.SubscriptionKey
with SubscriptionManager.EXTRA_SUBSCRIPTION_KEY

Bug: 147465477
Test: FrameworksCoreTests, FrameworksServicesTest, CarrierTests
Change-Id: I84d6687ca6cab86c8c68dc2dd2679cfee0919c1e
2020-01-13 16:07:48 -08:00
Automerger Merge Worker
d01f21c4d2 Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" am: b1c730d069 am: a2d0828670 am: 0a235b9416
Change-Id: I2d09de57c3ec3e501ea1b0d9b92430547d9cf6e4
2020-01-13 23:28:05 +00: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
Xiangyu/Malcolm Chen
34fb1da756 Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." 2020-01-13 21:56:31 +00: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
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
TreeHugger Robot
c54923ca57 Merge "Add new @SystemApis for RCS dependencies" 2020-01-11 02:54:22 +00:00
Malcolm Chen
93fcf24a23 Move ACTION_CARRIER_* intent and extras from TelephonyIntents to
TelephonyManager.

The purpose is to expose them as @SystemApi as they are used externally.

Bug: 140908357
Test: unittest
Change-Id: I3dabcb853ebbd648b20d97b446db11476780be25
2020-01-10 16:39:36 -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
Brad Ebinger
f8e4614a91 Add new @SystemApis for RCS dependencies
As part of mainline, remove telephony dependencies from RcsService
and PresencePolling apps.

Bug: 147319232
Test: atest CtsTelephonyTestCases
Change-Id: Id25bfffc1c40db8b183206dc598165272da7356c
2020-01-10 13:24:12 -08: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
Jayachandran Chinnakkannu
40d1c39d69 Merge "Move ACTION_SIGNAL_STRENGTH_CHANGED to local" 2020-01-10 18:26:37 +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
b8ffe81593 Use com.android.telephony.Rlog for mainline module.
Bug: 144374158
Test: make
Change-Id: I86a479affb8e0fa8e48734324a6a05c68230d910
2020-01-09 04:42:58 +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
Meng Wang
1b3499c83c Merge "System API used by telephony to bind to WapPushManager app." 2020-01-09 00:18:53 +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
Meng Wang
e6a40697e1 System API used by telephony to bind to WapPushManager app.
Bug: 145179378
Test: make
Change-Id: Ibfb5ce49d20addcd19775d9e8d762945e71b9843
2020-01-08 13:52:19 -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
Peter Wang
50298f75bc Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" 2020-01-08 21:35:25 +00:00
Jayachandran C
4eda57e047 Move ACTION_SIGNAL_STRENGTH_CHANGED to local
Also remove the reference to PhoneStateIntentReceiver as its being
removed as part of this CL

Bug: 147314715
Test: Build and basic sanity
Change-Id: I04d766ddae7958f0d2f35b50154e5e6d2f8dce7e
2020-01-08 12:01:21 -08:00
Makoto Onuki
f257d0141a Merge "Add a copy of Rlog for the telephony mainline module" 2020-01-08 18:40:43 +00:00
allenwtsu
c2524a47ad [RCS] Add set/getRcsProvisioningStatusForCapability()
Bug: 147122370
Test: build pass
Change-Id: I403df7a2e58bca0be7e459b39e944833f9f0f792
2020-01-08 20:09:50 +08:00