Commit Graph

10731 Commits

Author SHA1 Message Date
Automerger Merge Worker
b75ec096f9 Merge "[RCS] Create the new IMS RCS registration apis in AIDL ImsRcsController" am: eb30d6184e am: e2e6bdf324
Change-Id: Ic3c190c00b90506888bc96ee63ba19b77ce79c24
2020-01-10 02:22:13 +00:00
James Lin
eb30d6184e Merge "[RCS] Create the new IMS RCS registration apis in AIDL ImsRcsController" 2020-01-10 01:45:56 +00:00
Automerger Merge Worker
69424af797 move UiccAppType to annotation class am: bcc31107cd am: 15add5d1a8
Change-Id: I01cedffbf5f3b1aee43fa4b3bf33ea0c72a722bf
2020-01-10 00:33:45 +00:00
Chen Xu
15add5d1a8 move UiccAppType to annotation class
am: bcc31107cd

Change-Id: I444e69590c1f9e48e300f4c9bddfa2244cf9c676
2020-01-09 16:26:09 -08:00
Yan Yan
614fd1b51b Merge changes from topic "include-uiccapptype"
* changes:
  Make mainline IPsec(IKE) to statically include @UiccAppType
  move UiccAppType to annotation class
2020-01-10 00:23:28 +00:00
Automerger Merge Worker
907c95f3c7 Merge "Deprecate some UICC related APIs in TelephonyManager" am: fdd350b67a am: 4a0f894e07
Change-Id: Ic8064420142d961c92e04d606b74b952706c7146
2020-01-09 23:15:56 +00:00
Rambo Wang
fdd350b67a Merge "Deprecate some UICC related APIs in TelephonyManager" 2020-01-09 22:59:44 +00:00
Automerger Merge Worker
9333d0032e Merge "Flipping NR signal strengths coming from HAL" am: a9298cc06f am: 6f4151d3d7
Change-Id: If9e89fe832438170c90adf60911dc451208eae16
2020-01-09 20:59:40 +00:00
Daniel Bright
a9298cc06f Merge "Flipping NR signal strengths coming from HAL" 2020-01-09 20:33:12 +00:00
Automerger Merge Worker
d421d17d80 Merge "Expose Searching Status" am: 11485b8068 am: 8098737737
Change-Id: I626363349e1dae128bd93c32687e1ee532ecf61d
2020-01-09 07:48:27 +00:00
Shi Lu
11485b8068 Merge "Expose Searching Status" 2020-01-09 07:27:05 +00:00
Sarah Chin
df94694c42 Merge "Handle 5G meteredness in telephony framework" 2020-01-09 05:03:24 +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
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
1431ab2ee5 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:47 +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
Daniel Bright
f095731693 Flipping NR signal strengths coming from HAL
The documentation of NrSignalStrength states that some
of the cell signal strength values should be flipped when
taken in from the HAL (this matches what LTE does.)  The
current implementation did not match this behavior, this
chagne fixes that.

Bug: 144667130
Test: FrameworkTests
Change-Id: Ica2595c5b6480a52209fe5ec93de63c9f323316a
Merged-In: Ica2595c5b6480a52209fe5ec93de63c9f323316a
2020-01-08 16:24:52 -08:00
Automerger Merge Worker
5bf20b018c Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" am: 24a3f6a6cd am: 1430e17814
Change-Id: I383cb9d0462d9bc9574769210532e4988965fff0
2020-01-09 00:22:22 +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
24a3f6a6cd Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" 2020-01-08 23:58:23 +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
5eeb96ebd6 Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" am: b42b1e7302 am: d8b41fa1d0
Change-Id: I48c9b36fe1f2f2a9331afaeb33bc99819011ba0b
2020-01-08 22:44:42 +00:00
Chen Xu
bcc31107cd move UiccAppType to annotation class
this is to allow non-telephony mainline module statically link
to telephony annotatons.

Bug: 135956699
Test: Manual
Change-Id: I1207418cc83217cefc603589496660aa0d4be202
(cherry picked from commit d1b06a2090)
Merged-In: I1207418cc83217cefc603589496660aa0d4be202
2020-01-08 14:17:15 -08: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
Peter Wang
3d292322b9 [Telephony Mainline] Move TelephonyUtils to telephony/common
Bug: 140908357
Test: Build
Change-Id: I94764fcf698477285ea366c5c7e90e7bd8a27eb3
Merged-In: I94764fcf698477285ea366c5c7e90e7bd8a27eb3
2020-01-08 13:41:38 -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
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
995d20337f Merge "[Mainline] Create getDataRegistrationState and expose as system api" 2020-01-08 06:38:27 +00: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
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
Automerger Merge Worker
626ceae57e Merge "Remove unused broadcast DATA_CONNECTION_FAILED" am: d8836ba33f am: 2d9062cc48
Change-Id: Ic6046fc883372c42fd95886b143c1661b027cf6e
2020-01-07 20:31:13 +00:00
Automerger Merge Worker
e1d4aa1ab4 Merge "Add isEmergencyApn" am: 660a94aea9 am: 01493ff22b
Change-Id: I5fa0fa0b21db4c9796a0f0a3e15526eca285c7f8
2020-01-07 20:30:19 +00:00
Meng Wang
d8836ba33f Merge "Remove unused broadcast DATA_CONNECTION_FAILED" 2020-01-07 19:59:36 +00:00
Jordan Liu
660a94aea9 Merge "Add isEmergencyApn" 2020-01-07 19:29:39 +00:00