Commit Graph

3986 Commits

Author SHA1 Message Date
Brad Ebinger
70d67abe51 Merge "Remove shell commands for setting default SMS app" 2019-10-22 23:07:02 +00:00
Chen Xu
3321171cc7 Merge "non-mainline telephony related AIDL refactor/decoupling" 2019-10-17 18:27:13 +00:00
Chen Xu
1f6cfa5399 non-mainline telephony related AIDL refactor/decoupling
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony

Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-10-16 15:30:24 -07:00
Tyler Gunn
9f2efe987e Merge "Add ITelephony setCepEnabled command line command." am: ae48da3c55 am: ec6047ad09 am: b4dfa6e2fb
am: f23f696991

Change-Id: Id1a82749d4224cf8ee479c1a42ab8967fbdffa0c
2019-10-15 23:59:37 -07:00
Tyler Gunn
ec6047ad09 Merge "Add ITelephony setCepEnabled command line command."
am: ae48da3c55

Change-Id: Ib532a5c16c29596131a6fbeb695fc2a7d59dd81b
2019-10-15 23:29:29 -07:00
Treehugger Robot
ae48da3c55 Merge "Add ITelephony setCepEnabled command line command." 2019-10-16 06:13:47 +00:00
Sarah Chin
11c0ef2c5e Merge "5G meteredness for telephony framework" 2019-10-14 23:31:42 +00:00
Xiangyu/Malcolm Chen
b9732abea7 Merge changes Icc6e7da7,I9007978b,I060511af
am: 8dbe1f3b9b

Change-Id: I1914c74c1ab66855dee063d18044473e298bee1f
2019-10-14 14:34:25 -07:00
Hunter Knepshield
4f5bb32fca Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

NOTE: This is identical to ag/8193293, except that the
SubscriptionManager modifications don't make
getActiveSubscriptionIdList() static (it was causing test failures). A
further bug can be pursued to make everything static all at once.

Bug: 135684437
Test: manual
Change-Id: Iad6a3c2635e5eac2d33a16aa460b98394fd817f4
Merged-In: Iad6a3c2635e5eac2d33a16aa460b98394fd817f4
2019-10-14 14:15:09 -07:00
Xiangyu/Malcolm Chen
8dbe1f3b9b Merge changes Icc6e7da7,I9007978b,I060511af
* changes:
  Add APIs to return max possible active phones.
  Combine getPhoneCount, getSimCount and isMultiSimEnabled.
  Remove permission check for LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE
2019-10-14 21:06:13 +00:00
Jordan Liu
9bbcca844b Merge "Pass bearerData and serviceCategory to CB module for CDMA" 2019-10-14 20:38:09 +00:00
Malcolm Chen
793928c338 Add APIs to return max possible active phones.
This is first step towards reboot free single SIM to DSDS switch. As
getPhoneCount returns active phone count based on current configuration,
getMaxPhoneCount (subject to renaming) will return max possible active
phones(logical modems).

Bug: 141023026
Test: manual

Change-Id: Icc6e7da7c065eb3f72ec85a99ccc148639c574da
Merged-In: Icc6e7da7c065eb3f72ec85a99ccc148639c574da
2019-10-14 11:57:12 -07:00
Brad Ebinger
a38c4a2348 Remove shell commands for setting default SMS app
Use RoleManager shell commands directly instead of telephony
commands for setting the default sms app.

Bug: 142419519
Test: GtsTelephonyTestCases:ImsServiceTest
Change-Id: Ib150ff57ecd0872ba732b273b5e7363375723639
2019-10-11 14:30:34 -07:00
TreeHugger Robot
6412f4fd2c Merge "Move SmsApplication to telephony/common." 2019-10-09 23:36:21 +00:00
Jordan Liu
6d64fc657f Pass bearerData and serviceCategory to CB module for CDMA
CDMA cell broadcast messages require the bearer data and service
category to be passed along for parsing. This CL updates the AIDL
interface so this info can be passed.

Bug: 135956699
Test: manual
Change-Id: I98f79fbb384881de5cb65fa7fe7a08b3f5b2e272
2019-10-09 16:13:12 -07:00
Peter Wang
95c3d10f3a Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" 2019-10-09 22:45:11 +00:00
Jordan Liu
21fedfab99 Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions""
am: 8172f45111

Change-Id: Ieed5df537d2b6ff40c8a6b2c2bd7c8ab090c2e9a
2019-10-09 14:26:12 -07:00
Yincheng Zhao
6a98a37a3c Merge "Adding API in TelephonyManger for updating Fplmns." 2019-10-09 21:03:46 +00:00
Jordan Liu
656502be63 [DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"
This reverts commit b59c74f302.

Reason for revert: depends on ag/9477322 being CP'd, or else causes breakages downstream (b/142399383)

Change-Id: I25b1695757d5fec8c00f05d033c33501f4fc5389
2019-10-09 13:34:26 -07:00
Jordan Liu
33af2b8a0b Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27 am: 6802dbb6d5 am: 520be09949
am: 87bc4f1ee7

Change-Id: I1e62b6ed85c8789bcb19e134ef05ad8a2b89a428
2019-10-09 12:22:56 -07:00
Jordan Liu
6802dbb6d5 Merge "Rename DEFAULT_CARD_INDEX"
am: 038d1b5b27

Change-Id: Ifa033d9afac5ac1a6f454cbfe5de14149018f254
2019-10-09 11:44:17 -07:00
Treehugger Robot
038d1b5b27 Merge "Rename DEFAULT_CARD_INDEX" 2019-10-09 18:25:34 +00:00
Jordan Liu
a2ca902d2f Merge "Add CellBroadcastService and related permissions"
am: 32382561a6

Change-Id: I158509f8c22b1ea5780d9dcae126f4bf32184564
2019-10-09 09:26:01 -07:00
Sarah Chin
7af1fd0376 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
2019-10-08 20:09:37 -07:00
Jordan Liu
b59c74f302 Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: Ib1b20da03d271fc0b2736774b2ca6c6514944093
Merged-In: Ib1b20da03d271fc0b2736774b2ca6c6514944093
2019-10-08 11:20:46 -07:00
Amit Mahajan
1ec2e61e7f Move SmsApplication to telephony/common.
Test: basic sanity
Bug: 140763963
Change-Id: I8662c210319523abe64feaf0610af19fd285c8ca
2019-10-08 10:12:30 -07:00
TreeHugger Robot
183536f524 Merge "Move MmsManager and IMms to frameworks/base/mms" 2019-10-08 03:36:30 +00:00
Amit Mahajan
6237a6b35c Move MmsManager and IMms to frameworks/base/mms
Test: basic sanity
Bug: 140763963
Change-Id: Ib2cffce98f62913c3e50c59b63012c39d595d9ce
2019-10-07 17:41:26 -07:00
Peter Wang
0c1297b2d7 Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug: 139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
2019-10-07 17:25:18 -07:00
Chen Xu
515285b1b5 move CellBroadcastMessage from telephony-common to app
1. add slotIndex in SmsCbMesage
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage

Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: I07604101e3dccaa8e1539fa2644ef08da54d4533
2019-10-06 00:06:41 -07:00
Tyler Gunn
13c825139f Add ITelephony setCepEnabled command line command.
This new command line command is used to disable conference event package
handling so that we can test behavior where CEP is not present on a
network, even though a network actually supports it.

Test: Disabled CEP using command line tool, verified bug disposition.
Bug: 139299700
Change-Id: I9f2258ddfbe982159de0f37d4a865e2511079c72
2019-10-04 15:52:12 -07:00
Jordan Liu
b6ac1d67bc Merge "Add CellBroadcastService and related permissions" 2019-10-04 18:03:04 +00:00
Jordan Liu
289dfd037f Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: Ib1b20da03d271fc0b2736774b2ca6c6514944093
2019-10-03 14:56:52 -07:00
Chen Xu
d6b2673181 remove API RoleManager.getFinancialSms
getFinancialSms is not functional and not used today, thus
remove it to avoid future confusion

Bug: 138745655
Bug: 140908357
Test: atest android.telephony.cts.SmsManagerTest
Change-Id: Ib57d0fc189b6c894227894ee02b592f7ee46f22f
2019-10-03 14:37:53 -07:00
yincheng zhao
c245257cb1 Adding API in TelephonyManger for updating Fplmns.
Bug: 78790236
Test: Verified on blueline
Change-Id: Id19ae55cc03efbd085314e9d0026ca2486e9755d
2019-10-03 13:05:31 -07:00
Jack Yu
4358ca81ed Merge "Added read phone state permission for getNetworkCountryIso" 2019-10-03 17:22:59 +00:00
Jordan Liu
94d4fcb7b3 Merge "Expose CdmaSmsCbProgramData as SystemApi"
am: e3dfe362dc

Change-Id: I8ff5254d03558c69bc0cd8fd57a7337349de6be2
2019-10-01 13:51:51 -07:00
Jordan Liu
e3dfe362dc Merge "Expose CdmaSmsCbProgramData as SystemApi" 2019-10-01 20:33:29 +00:00
Jordan Liu
4ae91c0308 Expose CdmaSmsCbProgramData as SystemApi
Only getOperation and getCategory are currently used, so we only expose
those parts of the functionality. Eventually if we move BearerData to
the CBR app we will also have to expose the constructor, at which point
we may also want to expose the other constants that the constructor
uses, but for now this is okay.

Bug: 135956699
Test: manual
Change-Id: I1d3ba564372845f9b8a470adf82e84df745c02a7
Merged-In: I1d3ba564372845f9b8a470adf82e84df745c02a7
2019-10-01 10:42:56 -07:00
Jordan Liu
566ff18cc5 Merge "Expose CdmaSmsCbProgramData as SystemApi" 2019-10-01 17:39:17 +00:00
Brad Ebinger
64418f4c31 Merge "Integrate the active emergency session listener in TelephonyRegistry"
am: 4a54c2fa2b

Change-Id: I890a913c18332669dee8f21baf81db78a50a0fb0
2019-09-30 16:08:04 -07:00
Amit Mahajan
87778b8652 Merge "Remove unused @hide APIs from SmsManager." 2019-09-30 20:48:53 +00:00
Shuo Qian
b61230c51d Integrate the active emergency session listener in TelephonyRegistry
Add Telecom shell command: "adb shell telecom set-system-dialer"

Test: PhoneStateListener cts
Bug: 135204580
Merged-In: I5eaada6a671606642a849f0ff6fe964332d80d5f
Change-Id: I5eaada6a671606642a849f0ff6fe964332d80d5f
2019-09-30 20:43:42 +00:00
Amit Mahajan
24c01a2f79 Remove unused @hide APIs from SmsManager.
Also created a new MmsManager and moved imms APIs there. Will
make MmsManager @SystemApi in a later CL.

Test: basic sanity
Bug: 140763963
Change-Id: If22a85887c1aae0ab80562d58bc08c6965fd470f
2019-09-30 11:22:20 -07:00
Shuo Qian
f31d7e8edf Merge "Integrate the active emergency session listener in TelephonyRegistry" 2019-09-28 02:18:54 +00:00
Jordan Liu
e8fb76af19 Expose CdmaSmsCbProgramData as SystemApi
Only getOperation and getCategory are currently used, so we only expose
those parts of the functionality. Eventually if we move BearerData to
the CBR app we will also have to expose the constructor, at which point
we may also want to expose the other constants that the constructor
uses, but for now this is okay.

Bug: 135956699
Test: manual
Change-Id: I1d3ba564372845f9b8a470adf82e84df745c02a7
2019-09-27 16:34:34 -07:00
Shuo Qian
134334bb6e Integrate the active emergency session listener in TelephonyRegistry
Add Telecom shell command: "adb shell telecom set-system-dialer"

Test: PhoneStateListener cts
Bug: 135204580
Change-Id: I5eaada6a671606642a849f0ff6fe964332d80d5f
2019-09-27 14:22:51 -07:00
Jack Yu
105f65068c Added read phone state permission for getNetworkCountryIso
The slot based version of getNetworkCountryIso is a system API.
So it needs to be gaurded by permission.

Bug: 141646066
Test: Telephony sanity tests
Change-Id: I810ff0b77b93870ae3f62769977c7094789d0a5a
2019-09-26 11:44:52 -07:00
Chen Xu
e207bff221 Merge "use @SystemAPI for creating UserHandle"
am: 420bf71217

Change-Id: Ic9f389eefd4b7c4d519ff073fb0ef95c3d3dd3b1
2019-09-25 21:19:06 -07:00
Chen Xu
7ca0425127 Merge "use @SystemAPI in AppOpsManager"
am: 83fe845c8c

Change-Id: I08f5b713d8af575b3b0e8f61c9ba9332d5527257
2019-09-25 21:18:55 -07:00