Automerger Merge Worker
adf7e99baa
Merge "Add addOnSubscriptionsChangedListener with an executor as a parameter" am: 6c64897b4e am: 3fef1ac0e8 am: 08293747be
...
Change-Id: I351568382899993f43ec39ab205e5978acfa5e93
2020-01-09 04:01:08 +00:00
Automerger Merge Worker
08293747be
Merge "Add addOnSubscriptionsChangedListener with an executor as a parameter" am: 6c64897b4e am: 3fef1ac0e8
...
Change-Id: Ife154aab45f1b3f2864898a872c5a5a0191f0a9f
2020-01-09 03:47:00 +00: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
Automerger Merge Worker
2eabc68a4f
Merge "[Telephony Mainline] Make newFromBundle and fillInNotifierBundle System API" am: 593bd91f2c am: fd67572055
...
Change-Id: I126c9f94973100d03020cd74931dfc62a41591dd
2020-01-09 03:35:31 +00:00
Zongheng Wang
6c64897b4e
Merge "Add addOnSubscriptionsChangedListener with an executor as a parameter"
2020-01-09 03:11:39 +00:00
Sarah Chin
c26dc202c4
Merge "Make MmsManager public"
2020-01-09 02:51:47 +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
Xiangyu/Malcolm Chen
593bd91f2c
Merge "[Telephony Mainline] Make newFromBundle and fillInNotifierBundle System API"
2020-01-09 02:37:56 +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
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
6c04e82b30
Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId" am: 939d3d62cd am: 69804facae
...
Change-Id: I024e8d46492c7a40a30cd6aa036df2ddee1623ce
2020-01-09 00:21:44 +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
Malcolm Chen
cd6845de02
Expose setUiccApplicationsEnabled as @SystemApi for eSIM to call upon slot mapping change.
...
am: 4ece3db113
Change-Id: I06d6c9bf6dfda3a7a95de3d70220ea9d838e4916
2020-01-08 16:08:17 -08:00
Peter Wang
eeea33fb80
Merge "[Telephony Mainline] Expose APIs in SubscriptionManager"
2020-01-09 00:07:48 +00:00
Peter Wang
3e2fb955a8
Merge "[Telephony Mainline] Refactored ServiceManager calls"
2020-01-08 23:57:48 +00:00
Xiangyu/Malcolm Chen
939d3d62cd
Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId"
...
* changes:
Make sanitizeLocationInfo System Api.
Expose setUiccApplicationsEnabled as @SystemApi for eSIM to call upon slot mapping change.
Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId
2020-01-08 23:51:48 +00:00
Automerger Merge Worker
d9f8e96cea
Merge "[Mainline] Make canManageSubscription(SubscriptionInfo, String) System API." am: 5b879d5b2c am: 4e07be1fd7
...
Change-Id: I2a1b24ca0c20046855b26c324f0208ace3e7b47e
2020-01-08 23:29:28 +00:00
Xiangyu/Malcolm Chen
5b879d5b2c
Merge "[Mainline] Make canManageSubscription(SubscriptionInfo, String) System API."
2020-01-08 23:05:03 +00:00
Automerger Merge Worker
a215171da1
Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" am: b42b1e7302 am: d8b41fa1d0 am: 5eeb96ebd6
...
Change-Id: I063c28763198bc33ca6e35fe259fbb649df2fecf
2020-01-08 22:50:16 +00:00
Automerger Merge Worker
5eeb96ebd6
Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" am: b42b1e7302 am: d8b41fa1d0
...
Change-Id: I48c9b36fe1f2f2a9331afaeb33bc99819011ba0b
2020-01-08 22:44:42 +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
Meng Wang
b42b1e7302
Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED"
2020-01-08 22:05:07 +00:00
Malcolm Chen
538fd0d477
[Telephony Mainline] Make newFromBundle and fillInNotifierBundle System
...
API
The APIs are used in several placed where listens to
SERVICE_STATE_CHANGE broadcast.
Bug: 140908357
Test: build
Change-Id: I84543dbb056694d975799c7959c7ed66e286c530
Merged-In: I84543dbb056694d975799c7959c7ed66e286c530
2020-01-08 14:03:55 -08:00
Malcolm Chen
b9446af563
Make sanitizeLocationInfo System Api.
...
sanitizeLocationInfo is a helper API but it's used by TelephonyRegistry
which is not part of mainline module. So we need to expose it as System
Api, and properly rename it.
Bug: 146905502
Test: build flash and boot
Change-Id: Ia318ada2e478dbb24349119203b7869d23342ee5
Merged-In: Ia318ada2e478dbb24349119203b7869d23342ee5
2020-01-08 14:01:39 -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
Malcolm Chen
2619a9b138
[Mainline] Make canManageSubscription(SubscriptionInfo, String)
...
System API.
Bug: 146900942
Test: Build flash and bootup
Change-Id: I824582f9203b950d1153091181de345629adfe65
Merged-In: I824582f9203b950d1153091181de345629adfe65
2020-01-08 13:39:36 -08:00
TreeHugger Robot
acb948f299
Merge "Expose sanitizeLocationInfo as SystemApi"
2020-01-08 19:30:58 +00:00
Makoto Onuki
f257d0141a
Merge "Add a copy of Rlog for the telephony mainline module"
2020-01-08 18:40:43 +00:00
TreeHugger Robot
8404b4ab97
Merge "Flipping NR signal strengths coming from HAL"
2020-01-08 16:49:04 +00:00
Automerger Merge Worker
28f9ec87e2
Merge "[Mainline] Create getDataRegistrationState and expose as system api" am: 995d20337f am: 72cdeb7e07
...
Change-Id: I917cce895d8182a82298f1a9e6647bfd1df9f940
2020-01-08 07:22:14 +00:00
SongFerng Wang
5d02cd41c6
Merge "remove @link RegState"
2020-01-08 06:38:39 +00:00
SongFerng Wang
995d20337f
Merge "[Mainline] Create getDataRegistrationState and expose as system api"
2020-01-08 06:38:27 +00:00
Makoto Onuki
57e56f2d3c
Add a copy of Rlog for the telephony mainline module
...
We can't expose android.telephony.Rlog directly to the telephony
module as @SystemApi because we can't protect it from app code.
So instead, expose a lower level API from the Log class to the
telephony module with client=SystemApi.Client.MODULE_LIBRARIES so
it can only be accessed by boot classpath code, and then create
a copy of Rlog in the telephony module, which internally use the
aforementioned API.
Note:
- Support for MODULE_LIBRARIES is not fully in yet, so for now
the Log.logToRadioBuffer() API is still hidden.
- Once all the infra is in, we can expose logToRadioBuffer.
- Once we mark it with MODULE_LIBRARIES, ART will protect it
against app code, so no further protection will be needed.
Bug: 144374158
Test: boot
Change-Id: I5be0497a17d00152286fe3351bf58e75b675ceb6
2020-01-07 16:40:35 -08:00
Nathan Harold
1af97c9d91
Expose sanitizeLocationInfo as SystemApi
...
To support scrubbing the CellIdentity field from
within TelephonyRegistry, based on the changes for
mainline, this needs to be a SystemApi.
Bug: 147152984
Test: make update-api && make
Change-Id: If1cb6519a3da60ff0afab001c2804aaa70923dac
2020-01-07 16:35:42 -08:00
Automerger Merge Worker
76131d7715
Merge "Expose getActiveSubscriptionInfoForIcc for Mainline" am: 6a2dab6878 am: 545283a8d2
...
Change-Id: I838e73a328a4965b4a0b2217d57274feb97961d9
2020-01-08 00:18:06 +00:00
Peter Wang
d9eebca1c2
[Telephony Mainline] Refactored ServiceManager calls
...
to use TelephonyServiceManager
Bug: 142255256
Bug: 112725883
Test: Build, SimSmsTest, TelephonyRegistryTest, SimPhoneBookTest, OpportunisticNetworkServiceTest
Change-Id: I50068a02f1f5a4ff51acdbe4d1ded09ec4c4d6b8
2020-01-07 16:11:47 -08:00
Radhika Agrawal
82420e4e21
Merge "Report missed incoming calls which are auto rejected by the modem"
2020-01-07 23:59:20 +00:00
Shuo Qian
6a2dab6878
Merge "Expose getActiveSubscriptionInfoForIcc for Mainline"
2020-01-07 23:48:56 +00:00
Automerger Merge Worker
0d5314922c
Merge "[Telephony Mainline] Move CarrierAppUtils and LocationAccessPolicy to telephony common" am: 18077c1587 am: 85ba19fa5f
...
Change-Id: Ia47ac5e4128943dbf369b4f8c5e21aa503f6b67d
2020-01-07 23:09:43 +00:00
Peter Wang
18077c1587
Merge "[Telephony Mainline] Move CarrierAppUtils and LocationAccessPolicy to telephony common"
2020-01-07 22:59:17 +00:00
sqian
ff8dfe7eb2
Expose getActiveSubscriptionInfoForIcc for Mainline
...
Test: cts; treehugger
Bug: 122015219
Change-Id: I900e36fafe009206ec7431220603fcb8f404e33e
Merged-In: I900e36fafe009206ec7431220603fcb8f404e33e
(cherry picked from commit b086534dbe )
2020-01-07 13:45:07 -08:00
Shuo Qian
fec1058e9b
Merge "Expose getActiveSubscriptionInfoForIcc for Mainline"
2020-01-07 21:27:31 +00:00
Automerger Merge Worker
ae0e2a64d7
Merge "Add isEmergencyApn" am: 660a94aea9 am: 01493ff22b am: e1d4aa1ab4
...
Change-Id: Ic894002df6680918098097eee6207336718156ef
2020-01-07 20:48:21 +00:00
Automerger Merge Worker
e1d4aa1ab4
Merge "Add isEmergencyApn" am: 660a94aea9 am: 01493ff22b
...
Change-Id: I5fa0fa0b21db4c9796a0f0a3e15526eca285c7f8
2020-01-07 20:30:19 +00:00
Sarah Chin
0339a82c0a
Make MmsManager public
...
Test: atest TelephonyFrameworksTests
Bug: 144004293
Change-Id: I6cd3587ecba36c9ff9d45a6c174077e8dd7d8fb0
2020-01-07 11:54:55 -08:00
Jordan Liu
660a94aea9
Merge "Add isEmergencyApn"
2020-01-07 19:29:39 +00:00
Shuo Qian
b086534dbe
Expose getActiveSubscriptionInfoForIcc for Mainline
...
Test: cts; treehugger
Bug: 122015219
Change-Id: I900e36fafe009206ec7431220603fcb8f404e33e
2020-01-07 11:25:51 -08:00
TreeHugger Robot
c3733d88eb
Merge "Renamed SUB_ID to SUBSCRIPTION_ID"
2020-01-07 19:07:41 +00:00
Automerger Merge Worker
3ac69fd2b8
Merge "Do not use hidden HandlerExecutor" am: 166c8761a4 am: 2072de8ff8
...
Change-Id: Ic4710704a12bd0bc061d26390199355ed926557c
2020-01-07 18:55:38 +00:00
Nathan Harold
8b804f3308
Merge "Add Callback for Registration Failure"
2020-01-07 18:17:03 +00:00