Commit Graph

3919 Commits

Author SHA1 Message Date
Peter Wang
ca01a7ee08 Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" 2019-10-28 19:32:18 +00:00
Xin Li
b2198fa670 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Peter Wang
2ab852d411 Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug: 139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Merged-In: Ib8496ed6dbc6179940892de8df7901e84dd67d76
2019-10-25 14:26:22 -07:00
Chen Xu
17518fa149 Merge "move CellBroadcastMessage from telephony-common to app" 2019-10-25 17:28:22 +00:00
Chen Xu
7e902363a6 Merge "make CallerInfo as SystemAPI" 2019-10-25 17:27:45 +00:00
Yincheng Zhao
02f0815ddc Merge "Adding API in TelephonyManger for updating Fplmns."
am: 32eb91717f

Change-Id: I6f1ec15774320b08238c9338ff849b7528c120a6
2019-10-24 14:38:49 -07:00
Yincheng Zhao
32eb91717f Merge "Adding API in TelephonyManger for updating Fplmns." 2019-10-24 20:50:27 +00:00
Chen Xu
fba9ca44a2 make CallerInfo as SystemAPI
1. move CallerInfo from telephony.internal to andorid.telephony package
2. expose APIs inside CallerInfo which are consumed by non-telephony
code.

Bug: 140908357
Test: Build
Change-Id: Ie95897c77e97e40f5357c107aede82edfea44d5a
(cherry picked from commit b9a1eefec6)
Merged-in: Ie95897c77e97e40f5357c107aede82edfea44d5a
2019-10-21 21:39:58 -07:00
Chen Xu
a6379bcd18 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
(cherry picked from commit 515285b1b5)
Merged-in: I07604101e3dccaa8e1539fa2644ef08da54d4533
2019-10-19 20:36:26 -07:00
Jordan Liu
09a3b50108 Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions"
am: 6af905e0fe

Change-Id: I166c9396c5b4d194cb2510a454005dc83b442247
2019-10-18 16:29:57 -07:00
Jordan Liu
7aea30267c [DO NOT MERGE] Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: I865c09d6d246779b706c06371df685d415618699
2019-10-18 14:20:50 -07:00
yincheng zhao
da2ec5ccb1 Adding API in TelephonyManger for updating Fplmns.
Bug: 78790236
Test: Verified on blueline
Change-Id: Id19ae55cc03efbd085314e9d0026ca2486e9755d
Merged-In: Id19ae55cc03efbd085314e9d0026ca2486e9755d
(cherry picked from commit c245257cb1)
2019-10-17 20:08: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
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
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
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
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
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
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
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
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
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
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
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
Chen Xu
206d891d07 Merge "use packageManager @SystemAPI"
am: e958bbd8ae

Change-Id: I28e807aaec27837ab31631eda97accf54198240c
2019-09-25 21:18:47 -07:00
Chen Xu
420bf71217 Merge "use @SystemAPI for creating UserHandle" 2019-09-26 03:43:44 +00:00
Chen Xu
83fe845c8c Merge "use @SystemAPI in AppOpsManager" 2019-09-26 03:43:44 +00:00
Chen Xu
e958bbd8ae Merge "use packageManager @SystemAPI" 2019-09-26 03:43:44 +00:00
Chen Xu
e5ea21aa3b use @SystemAPI for creating UserHandle
Bug: 137202333
Test: Build & Unit test
Merged-In: Id2a696bed6a80c92291c8f968f3aaa8db6bb83df
Change-Id: Id2a696bed6a80c92291c8f968f3aaa8db6bb83df
(cherry picked from commit 59d76e97bb)
2019-09-25 18:03:40 -07:00
Chen Xu
4927f6d7da use @SystemAPI in AppOpsManager
Bug: 137202333
Test: Build & unit test
Merged-In: Ief8d20b62df5fcd99980182d9bb896bd82ac70e9
Change-Id: Ief8d20b62df5fcd99980182d9bb896bd82ac70e9
(cherry picked from commit 324606e459)
2019-09-25 17:59:17 -07:00
Chen Xu
6a2926cd44 use packageManager @SystemAPI
Bug: 137202333
Test: Build
Merged-In: I1c0cb7840cb7d68fd720723eec96aa51aefc1df8
Change-Id: I1c0cb7840cb7d68fd720723eec96aa51aefc1df8
(cherry picked from commit 4b5f423c5c)
2019-09-25 17:54:07 -07:00
Hyungjun Park
2f3eb5d88f Merge "Add isApplicationOnUicc API"
am: 3dc68a9585

Change-Id: I995d6b61d43a39ad5e52c99e62ac292540a0be7e
2019-09-17 19:17:24 -07:00
Treehugger Robot
3dc68a9585 Merge "Add isApplicationOnUicc API" 2019-09-18 02:00:54 +00:00
Shuo Qian
fc225eab6b Merge "Listeners of active emergency numbers"
am: 7674b345a9

Change-Id: Ie18a4c1d18ae9fb1dbddc5f9997c471873f8ba78
2019-09-13 13:24:42 -07:00
Shuo Qian
e6f0e85516 Listeners of active emergency numbers
1) Introduce a new signature-level system permission allowing system apps to listen the
 active emergency number, placed by calls or texts.

2) Add PhoneStateListener API surface to provide a mechanism to listen the
outgoing call emergency number or outgoing sms emergency number.

Bug: 135204580
Test: atest
Change-Id: I6e6bce6d4b97d492ca20302002911f9daa20767e
Merged-In: I6e6bce6d4b97d492ca20302002911f9daa20767e
(cherry picked from commit 7a1eb6d56b)
2019-09-13 03:16:17 +00:00
Xin Li
d57e959e71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Pengquan Meng
156f347db4 Merge "Support maximum wait time for Cell broadcast" 2019-09-06 17:15:28 +00:00
Pengquan Meng
9f677a0790 Support maximum wait time for Cell broadcast
Geo-Fencing Maximum Wait Time a device shall allow to determines it
location meeting operator policy. If the device is unable to determine
its position meeting operator policy within the GeoFencing Maximum Wait Time,
it shall present the alert to the user and discontinue further positioning
determination for the alert.

Bug: 139022202
Test: manual
Merged-In: If3d8d7915f2d86da20c63e99bee01f30e3ea89c0
Change-Id: If3d8d7915f2d86da20c63e99bee01f30e3ea89c0
(cherry picked from commit 02d6ac0f20)
2019-09-05 15:27:31 -07:00
Jordan Liu
d41a61df80 Merge "Change CellBroadcast APIs to SystemApi"
am: 82454e029f

Change-Id: Ic39446ab84f910b0f5225ad42f061e2a525ec868
2019-09-03 13:52:14 -07:00
Jordan Liu
6491711995 Rename DEFAULT_CARD_INDEX
Bug: 120621713
Test: manual
Change-Id: Idb0a464efd6316e0c31faebb80457092a411b23c
2019-09-03 13:44:04 -07:00
Jordan Liu
e4141f0e8b Change CellBroadcast APIs to SystemApi
Bug: 135956699
Test: atest SmsManagerPermissionTest
Change-Id: Ibbb22505a80567d1c08cffe9b7a7fdbd10890abe
Merged-In: Ibbb22505a80567d1c08cffe9b7a7fdbd10890abe
2019-09-03 11:32:58 -07:00
Brad Ebinger
18f96879c2 Merge "Preprocessing Teleservice Id 0xFDEA SMS WAP"
am: 597234f119

Change-Id: I63b3906b26643d50d0208e4231306b9cf830e977
2019-08-28 17:12:27 -07:00