Commit Graph

4308 Commits

Author SHA1 Message Date
Calvin Pan
2ffecdb9fd Merge "Redesign the setPreferredNetworkType" 2020-01-20 08:00:05 +00:00
zoey chen
16a1821f9c [Settings] To avoid use APIs in IccCard directly, moving APIs into TelephonyManager.
IccCard#changeIccLockPassword
IccCard#setIccLockEnabled
IccCard#getIccLockEnabled
Bug: 146983487
Test: manual

Change-Id: I1a3c3b15063ea00d0ca59bd5395f2bca8cdfe391
2020-01-19 00:02:10 +08:00
Daniel Bright
2f7dc20d92 Merge "Make string version of APN_TYPEs a @SystemApi" 2020-01-17 23:38:56 +00:00
Tom Taylor
086de218b9 Merge "Let sms app pass a logging id to telephony" 2020-01-17 22:11:53 +00:00
Automerger Merge Worker
782b1edcb7 Merge "Add call barring constants to ImsUtImplBase" am: 87cf4b146e am: c27cece2a5 am: 80191c2775
Change-Id: I5b476a1e0af70d65ba6b04d775ef54ae812d198d
2020-01-17 21:48:58 +00:00
Automerger Merge Worker
c27cece2a5 Merge "Add call barring constants to ImsUtImplBase" am: 87cf4b146e
Change-Id: I847cbce27c37731798809503c95152db0d1c6b69
2020-01-17 19:58:26 +00:00
Tom Taylor
66afc8fab2 Let sms app pass a logging id to telephony
Bug: 135755360

Test: manually test sending and receiving sms's and mms's via the
Messaging app and verify the messageId is passed back and forth.
Change-Id: I5a0d2cd9b8e5e75062cc895512da1a3357c57dbf
2020-01-17 08:01:05 -08:00
calvinpan
d11c1218d5 Redesign the setPreferredNetworkType
Some APPs(like OMA DM) might enable or disable 5G settings, so redesign
the setPreferredNetworkType behavior.

1. Create allowed_network_type in telephonyprovider
2. Create get/set allowed network type API
3. When APPs call setPreferredNetworkType() that will AND with allowed
network type.

Bug: 136730709
Test: By Manual
1. setAllowedNetwork to disable 5G
2. setPreferredNetworkTypeBitmask to set NR_LTE_GSM_WCDMA
3. framework set LTE_GSM_WCDMA to modem
Change-Id: Ia257e6ddaa33c32bc09340a59c9daf71ce1fa8cf
2020-01-17 20:56:41 +08:00
Daniel Bright
8bb56fc88c Make string version of APN_TYPEs a @SystemApi
The string version of Apn Types are used in the carrier config table.
Modules besides Telephony uses this table directly and so it made sense to expose
this as a @SystemApi

Test: ApnSettingsTest
Bug: 147465477
Change-Id: I1c344b3ff482d973b8bf51a33956a7f90f291634
2020-01-16 22:34:38 -08:00
Shuo Qian
4801bd0970 Merge "Refactor SmsManager not to use ActivityThread hidden API in Mainline" 2020-01-16 21:34:21 +00:00
Hall Liu
eb7a2ad408 Add call barring constants to ImsUtImplBase
Add call barring constants to ImsUtImplBase in order to expose them in
the system API surface.

Fixes: 147733594
Bug: 146834818
Test: build
Change-Id: Ieb701625b1ecf858d67648f5bb4c87f3e87c1f73
2020-01-16 10:25:59 -08:00
Xin Li
e13851556b DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
Jayachandran Chinnakkannu
ff27c7aa44 Merge "Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE" 2020-01-16 00:13:13 +00:00
Nathan Harold
bbc2aaeaaa Merge changes from topic "barring-info"
* changes:
  Add a BARRING_TYPE_UNKNOWN for Unreported Barring
  Add Callback to notify changes of barring status
2020-01-16 00:06:07 +00:00
Shuo Qian
24fded67fb Refactor SmsManager not to use ActivityThread hidden API in Mainline
Introduce a server API to get current package name to remove
 ActivityThread for Mailine

Test: Treehugger; no function change; Manual: tried to send a message to 22000,
      and observed that it pops out a notification window to ask me: "Messages
      would like to send a message to 22000, Cancel or Send?" I clicked on "Send".
      UI shows that SMS is sent successfully.
Bug: 145147528
Change-Id: I0a5ca7699c969585ea08c82ea7cafd26a73c08f9
2020-01-15 22:40:54 +00:00
Jayachandran C
f0a973b564 Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE
Bug: 140768340
Test: Following tests have been done
atest packages/services/Telephony/tests/
atest frameworks/opt/telephony/tests/telephonytests/
Manual sanity to check basic telephony

Change-Id: Ia114e4546d88e294ed37b6632a1eae6a06fbf7bc
2020-01-15 13:45:07 -08:00
Automerger Merge Worker
d3cb54c8d9 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23 am: f01f6aec2f
Change-Id: I93ebc67677fc326871ba151a4b6bae0bc60e197d
2020-01-15 03:36:50 +00:00
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
Nathan Harold
c564b1dc33 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
Change-Id: I08240259f3142beeca991238bf705236f0303954
2020-01-14 13:54:09 -08:00
Daniel Bright
f16dc0708a Merge "Rewriting phone constants for mainline" 2020-01-14 21:14:35 +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
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
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
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