Commit Graph

75 Commits

Author SHA1 Message Date
Hall Liu
6158137cf2 Rename addServiceAnnouncement-related methods
Address feedback on the API

Fixes: 155926142
Test: CTS
Change-Id: I69e17faf4d09ab686fdd97975bc7f069597b87b3
2020-05-18 14:52:18 -07:00
Sooraj Sasindran
88823275ee Merge changes from topic "setDataEnabled"
* changes:
  Make sure to handle exceptions for setDataEnabled
  Revert^2 "Support api to control data by thermal service" ag/11382713 fixes exception issue with original change. 94b46ef784
2020-05-06 15:55:40 +00:00
Sooraj Sasindran
b2c6fee602 Revert^2 "Support api to control data by thermal service"
ag/11382713 fixes exception issue with original change.
94b46ef784

Bug: 151342791
Change-Id: I5e38549a3050d582017fe8bbf193adc65eb12860
2020-05-06 15:30:35 +00:00
Greg Kaiser
8720228eba Merge "Revert "Support api to control data by thermal service"" 2020-05-05 19:57:48 +00:00
Greg Kaiser
94b46ef784 Revert "Support api to control data by thermal service"
Revert "CTS test for api to control data by thermal service"

Revert "Support api to control data by thermal service"

Revert "Support api to control data by thermal service"

Revert submission 11171206-setDataEnabled

Bug: 155765311
Reason for revert: wembley gets into boot loop on reboot due to this code
Reverted Changes:
I3cdab9b04:Support api to control data by thermal service
I716cf6c45:CTS test for api to control data by thermal servic...
Ic5634e6f7:Support api to control data by thermal service
I763c422ba:Support api to control data by thermal service

Change-Id: If023dc8e106650b63706c0a5df24850c1260f785
2020-05-05 16:47:47 +00:00
Hall Liu
598883a072 Merge "Add the addServiceAnnouncement API for EMBMS" 2020-05-05 01:57:49 +00:00
Sooraj Sasindran
1e9c1966e6 Merge "Support api to control data by thermal service" 2020-05-04 23:49:27 +00:00
Hall Liu
c045df60be Add the addServiceAnnouncement API for EMBMS
Add addServiceAnnouncement to MbmsDownloadSession, allowing apps to add
service announcements from group call servers and receive information
about available files via the MbmsDownloadSession API surface.

Fixes: 144368478
Test: CTS
Change-Id: I760400f56219879fe71d0115042a3be2f83cef90
2020-05-04 15:10:33 -07:00
Sooraj Sasindran
ea5e69c414 Support api to control data by thermal service
Support api to control data by thermal service
Restructure data enablement API to have single API
with reason as an input to stop adding new apis
for new usecases.

Bug: 151342791
Test: added new CTS tests and verified

Change-Id: I763c422ba54907984977d19b2774c31337e5ffe5
2020-05-04 09:28:14 -07:00
Svet Ganov
ea8a2145c9 Revert an API breaking changes
bug:150281259

Test: N/A

Change-Id: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
2020-05-01 15:25:51 -07:00
Hall Liu
8e32a5b027 Expose android.telephony.DisconnectCause
Expose these constants since they're referred to by a public carrier
config key.

Fixes: 145663507
Test: compile
Change-Id: I276761170b3cf5d740f7dbe945834934082a1428
2020-04-22 11:24:25 -07:00
TreeHugger Robot
0d5ca1633e Merge "Remove replaced PreciseDataConnectionState methods from SDK." into rvc-dev am: da50240343 am: 0480d926a2 am: 93636ae765 am: 73390c7709
Change-Id: Idb832b50fc48d7c86ed344946610228bb1e61122
2020-03-31 05:57:09 +00:00
TreeHugger Robot
93636ae765 Merge "Remove replaced PreciseDataConnectionState methods from SDK." into rvc-dev am: da50240343 am: 0480d926a2
Change-Id: I61f9d33d17a74b643d2b29443ba72a5ac6acc64c
2020-03-30 22:51:13 +00:00
TreeHugger Robot
da50240343 Merge "Remove replaced PreciseDataConnectionState methods from SDK." into rvc-dev 2020-03-30 22:24:30 +00:00
Michael Wright
eec778ccdd Remove replaced PreciseDataConnectionState methods from SDK.
Prior to finalization, we need to remove all methods which were
replaced but kept around for short-term compatibility purposes.
PreciseDataConnectionState had a couple methods that fell into this
category that had yet to be removed.

Bug: 152787887
Test: builds
Change-Id: Ib175b2530791cec7e31684a1d3f318c95e27f707
2020-03-30 20:39:27 +00:00
TreeHugger Robot
a79b73f678 Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" into rvc-dev am: ddcf560b4e am: 33ad367719 am: 976e8eab2c am: 48de9e2671
Change-Id: I2a280d80c0c775c57c5a0f71028e5dfdaf197278
2020-03-28 00:46:43 +00:00
TreeHugger Robot
976e8eab2c Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" into rvc-dev am: ddcf560b4e am: 33ad367719
Change-Id: I642dbfaa3ad8b67881b73e3dafbd7a1da7598363
2020-03-28 00:06:55 +00:00
Daniel Bright
ef5836157f Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult
Fully rolled back comments and signature to original state before change

Test: bootup phone
Bug: 147854704
Change-Id: I5fcd71e1569e6b0e16cff5392239b89259ee1790
2020-03-27 15:01:16 -07:00
TreeHugger Robot
d73afef082 Merge "Un-expose APIs added for telephony mainline." into rvc-dev am: 9a58d5747a am: 9c614e6fe6 am: cb0dc65b6d am: bcd1229948
Change-Id: Idb363dde8ef5b5f88d7b531bbc4f70a92c101c6d
2020-03-21 22:10:56 +00:00
TreeHugger Robot
cb0dc65b6d Merge "Un-expose APIs added for telephony mainline." into rvc-dev am: 9a58d5747a am: 9c614e6fe6
Change-Id: I00832aa6a5c3a4a8f96250d18b3f49eb3a72a519
2020-03-21 21:38:25 +00:00
TreeHugger Robot
9a58d5747a Merge "Un-expose APIs added for telephony mainline." into rvc-dev 2020-03-21 21:17:33 +00:00
TreeHugger Robot
41b114abf7 Merge "[Telephony Mainline] Hide TelephonyServiceManager and TelephonyFrameworkInitializer" into rvc-dev am: 4e4fa985c1 am: e83559865d am: f24a4298ee am: 628c3ffd63
Change-Id: I72fc6ecf1fdfb7c03e1c7eac2e1b64c50e63d6a0
2020-03-21 05:47:07 +00:00
TreeHugger Robot
e83559865d Merge "[Telephony Mainline] Hide TelephonyServiceManager and TelephonyFrameworkInitializer" into rvc-dev am: 4e4fa985c1
Change-Id: Ie84f2a81916e9e9d889ecce8e18216d28158ed6f
2020-03-21 05:09:15 +00:00
TreeHugger Robot
4e4fa985c1 Merge "[Telephony Mainline] Hide TelephonyServiceManager and TelephonyFrameworkInitializer" into rvc-dev 2020-03-21 05:05:27 +00:00
TreeHugger Robot
09f2dfb2c2 Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into rvc-dev am: 7840df3d27 am: 5390bb2f3f am: 910b7f4b15 am: 32308991cb
Change-Id: I2c1ed13292a74dcb3a361975d4d392c352ebf829
2020-03-21 03:30:48 +00:00
TreeHugger Robot
910b7f4b15 Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into rvc-dev am: 7840df3d27 am: 5390bb2f3f
Change-Id: Iccd0c710ecdee9acca5140146de587b2af820572
2020-03-21 02:59:38 +00:00
TreeHugger Robot
e61748aa59 Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into rvc-dev am: 7840df3d27
Change-Id: Ia5e0d3fb7720d5cae34d95873366a466b01a06d7
2020-03-21 02:48:26 +00:00
TreeHugger Robot
7840df3d27 Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into rvc-dev 2020-03-21 02:47:36 +00:00
TreeHugger Robot
1906ab798b Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev am: 98f6a63baa am: 128e397246 am: 4d54af8216 am: 7ae55861eb am: beb7dc3003
Change-Id: I1f78d49e91b8b2904c55da8b010053c7f43e1d99
2020-03-21 01:19:19 +00:00
Peter Wang
23cf98eaa8 [Telephony Mainline] Hide TelephonyServiceManager and TelephonyFrameworkInitializer
Bug: 151455139
Fix: 151455139
Test: Build
Change-Id: I067c821239585d3d4e8dcf39798b1d0014ba077b
2020-03-20 17:34:49 -07:00
Amit Mahajan
4009110b3b Un-expose APIs added for telephony mainline.
Will be reworked on in R.

Test: basic sanity
Bug: 140908357
Change-Id: Ib18b66c9351b0434d7c46e004cd162928d7133f7
2020-03-21 00:21:48 +00:00
TreeHugger Robot
beb7dc3003 Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev am: 98f6a63baa am: 128e397246 am: 4d54af8216 am: 7ae55861eb
Change-Id: I3333685c9a9099393849b9fadb99f1e7704c86ea
2020-03-21 00:02:25 +00:00
TreeHugger Robot
cb10200386 Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev am: 98f6a63baa am: 128e397246
Change-Id: I20c9ebbc14756ab96acce0dccc835571e00ab1c4
2020-03-20 23:24:57 +00:00
TreeHugger Robot
ef4fc7bcdc Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev am: 98f6a63baa
Change-Id: Ib68ea1fde39cfb8922c1dc43837a5fa55bd7a2b5
2020-03-20 23:23:31 +00:00
TreeHugger Robot
98f6a63baa Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev 2020-03-20 23:19:53 +00:00
Amit Mahajan
1c6679a3ad Exposing TelephonyManager.isIccLockEnabled as a system API.
This was recently removed as part of un-exposing telephony
mainline related APIs (b/146983487), but being added back in R as GMSCore
already uses it (b/151742706).

Test: TH
Bug: 151742706
Bug: 146983487
Change-Id: If4e8e87c7dfbb261ee3abfec2a4774980c24d0c2
2020-03-20 14:39:06 -07:00
Betty Chang
d205094ecb Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."" into rvc-dev am: 52a836d49c am: e9a7b4dae3 am: da0e11c2ff am: 57b2f6b589
Change-Id: I71fb94ad05951aecdff9ac32d85ceb6d57b4c625
2020-03-20 16:34:13 +00:00
Betty Chang
e9a7b4dae3 Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."" into rvc-dev am: 52a836d49c
Change-Id: Ieef9f041cef5cdd1bb7b7513ed821ab2e933e2e9
2020-03-20 15:51:56 +00:00
Betty Chang
52a836d49c Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."" into rvc-dev 2020-03-20 15:46:42 +00:00
Betty Chang
98c0acf832 Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev am: 4ce79c63de
Change-Id: I4e85c63c89bcf9d757b66888b27463f007adfc3d
2020-03-20 04:09:08 +00:00
Betty Chang
b8446f8154 Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev am: 4ce79c63de am: 688a8633b6 am: 60624c2c60 am: a255545586
Change-Id: Id6a5bbc6ecc5624bc8711b15084c4a0d5e14eb7f
2020-03-20 03:31:36 +00:00
Betty Chang
60624c2c60 Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev am: 4ce79c63de am: 688a8633b6
Change-Id: I69a3db65bdfefd8e331550c39e98f3cd840d95ed
2020-03-20 03:02:58 +00:00
Betty Chang
4ce79c63de Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev 2020-03-20 02:30:50 +00:00
Betty Chang
e40c8c3b29 Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."
Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."

Revert submission 10702401-revert-10665971-TML_revertSystemApi-ZNISIHWMFP

Reason for revert: Fixing build by make framework-telephony-stubs-srcs-update-current-api (new txt file has been added for telephony)
Reverted Changes:
I5a320c062:Revert "[Telephony Mainline] To mark @hide for mai...
I0e762e0dd:Revert "[Telephony Mainline] To mark @hide for mai...

Test: make
Bug:151896160

Change-Id: I6f22488aca8f2059d9fb4be48116edc52856a393
2020-03-20 10:13:35 +08:00
Malcolm Chen
629f9111f7 Hide APIs exposed for Telephony mainline which is no longer needed in R.
The APIs were added in b/144351078, b/148097978 and b/148116922.
b/151665796 is used to revert them.

Bug: 151665796
Bug: 144351078
Bug: 148097978
Bug: 148116922
Test: build
Change-Id: I08db8c5c0161747a7e775a8de0daa7077b513f10
2020-03-20 01:25:45 +00:00
Radhika Agrawal
2117f72fbb Merge "API review comments Test: make Bug: b/150126235" into rvc-dev am: 66a3e59965 am: b2344a5321 am: 6553f2a2aa am: 9c983fd644
Change-Id: Ie91547ecc07d610cbcda3428780a666adfea7264
2020-03-19 23:06:21 +00:00
Radhika Agrawal
6553f2a2aa Merge "API review comments Test: make Bug: b/150126235" into rvc-dev am: 66a3e59965 am: b2344a5321
Change-Id: I556eb9dcb6e4830bbcb6424f2bb192bf76f54223
2020-03-19 22:33:06 +00:00
Radhika Agrawal
947f13819c Merge "API review comments Test: make Bug: b/150126235" into rvc-dev am: 66a3e59965
Change-Id: Ief935d1b600da731b0a97d4bec42fd46b835a71c
2020-03-19 22:20:01 +00:00
Radhika Agrawal
66a3e59965 Merge "API review comments Test: make Bug: b/150126235" into rvc-dev 2020-03-19 22:09:23 +00:00
Peter Wang
eb2dc2a113 Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" into rvc-dev am: d9773f2ca6 am: ee1576b3d4 am: c6b3a1e9ea am: 470d063b3a
Change-Id: Iae9d44651a2e82fd8f3508b63dc36cf21bb0228b
2020-03-19 21:37:48 +00:00