Commit Graph

11480 Commits

Author SHA1 Message Date
TreeHugger Robot
c54923ca57 Merge "Add new @SystemApis for RCS dependencies" 2020-01-11 02:54:22 +00:00
Mingming Cai
8151145dbb Merge "Migrate convertHalCellIdentityToCellIdentity()" 2020-01-10 23:42:07 +00:00
Shuo Qian
2f1b6c4162 Merge "Make hidden API isDataCapable for Telephony" 2020-01-10 22:17:43 +00:00
Sarah Chin
88246a507f Merge "Revert "Make MmsManager public"" 2020-01-10 21:47:07 +00:00
Brad Ebinger
f8e4614a91 Add new @SystemApis for RCS dependencies
As part of mainline, remove telephony dependencies from RcsService
and PresencePolling apps.

Bug: 147319232
Test: atest CtsTelephonyTestCases
Change-Id: Id25bfffc1c40db8b183206dc598165272da7356c
2020-01-10 13:24:12 -08:00
Mingming Cai
f55983a5d5 Migrate convertHalCellIdentityToCellIdentity()
Remove convertHalCellIdentityToCellIdentity() in
CellularNetworkService, and introduce create() in CellIdentity
for CellIdentity 1.0 and 1.2.

Bug: 146498725
Test: atest CellularNetworkServiceTest
Change-Id: Ibf07f770b377c383ea0c4d3ef2d1d991a37854a9
2020-01-10 13:18:14 -08:00
Sarah Chin
ee13f12c40 Revert "Make MmsManager public"
This reverts commit 0339a82c0a.

Reason for revert: RP1A.200110.001 cannot send/receive MMS

Bug: 147475284
Change-Id: I5952168aba996a10554406a9f1675ac3b04fa41f
2020-01-10 19:36:04 +00:00
Jayachandran Chinnakkannu
40d1c39d69 Merge "Move ACTION_SIGNAL_STRENGTH_CHANGED to local" 2020-01-10 18:26:37 +00:00
TreeHugger Robot
89a117ac8c Merge "Remove @hide for CarrierConfigManager constant" 2020-01-10 08:40:07 +00:00
Jimmy Chen
881f71a0e7 Merge "Wifi: define carrier config for IMS deregistration wifi off deferring time" 2020-01-10 02:48:44 +00:00
Automerger Merge Worker
273140014a Merge "[RCS] Create the new IMS RCS registration apis in AIDL ImsRcsController" am: eb30d6184e am: e2e6bdf324 am: b75ec096f9
Change-Id: Ic6e107c0cd9fb393393e78945a4f676b36b8577b
2020-01-10 02:40:40 +00:00
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
Meng Wang
cb1aa8d29c Merge "Use com.android.telephony.Rlog for mainline module." 2020-01-10 01:11:38 +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
83b9c07104 Merge "Deprecate some UICC related APIs in TelephonyManager" am: fdd350b67a am: 4a0f894e07 am: 907c95f3c7
Change-Id: I967ff804d2dabea9215478d742d7968754c060bc
2020-01-09 23:27:30 +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
Sarah Chin
0ccf57c44c Remove @hide for CarrierConfigManager constant
ENABLE_EAP_METHOD_PREFIX_BOOL

Test: build
Bug: 147447171
Change-Id: I345ddd5985d3a18c3bfa05ac557613c7def21559
2020-01-09 22:31:04 +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
TreeHugger Robot
2a3b7a21c0 Merge "Use new UnsupportedAppUsage annotation." 2020-01-09 09:41:06 +00:00
Automerger Merge Worker
67720d843c Merge "Expose Searching Status" am: 11485b8068 am: 8098737737 am: d421d17d80
Change-Id: Ic41f57dcedd1eca1d6bff89bac8f33ff7ff1442d
2020-01-09 08:01:15 +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
Meng Wang
b8ffe81593 Use com.android.telephony.Rlog for mainline module.
Bug: 144374158
Test: make
Change-Id: I86a479affb8e0fa8e48734324a6a05c68230d910
2020-01-09 04:42:58 +00:00
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
Shuo Qian
291415806f Make hidden API isDataCapable for Telephony
Rename isDataCapable to isDataConnectionEnabled as a System API for
 System UI.

Test: RILTest; Treehugger; cts
Bug: 147017757
Change-Id: I96b45575eb7f030f3dcb9539c06f8ec25539e2e9
2020-01-08 18:39:44 -08: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
Jimmy Chen
7e47f39136 Wifi: define carrier config for IMS deregistration wifi off deferring time
Deferring time depends on the carrier requirement.

Bug: 142750916
Test: N/A
Change-Id: I102d255bac9d36abed2c5792310082a97ab5fcfc
2020-01-09 09:51:12 +08: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
Meng Wang
1b3499c83c Merge "System API used by telephony to bind to WapPushManager app." 2020-01-09 00:18:53 +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
24a3f6a6cd Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" 2020-01-08 23:58:23 +00:00