Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
635,217 Commits 3 Branches 0 Tags
4bcba57a8d71f05490fe5a577eeede006d591ff9
Commit Graph

11462 Commits

Author SHA1 Message Date
Zoey Chen
3958b3f018 Merge "[Telephony] Return if context is null when register TelephonyCallback" am: a805d39229 am: 51f11f9b0b am: aab9659d41 am: 38c581fc6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644386

Change-Id: I56d41a160a638be3dd696f6cd7baa47205d2acee
 2021-03-19 11:47:20 +00:00
Zoey Chen
38c581fc6c Merge "[Telephony] Return if context is null when register TelephonyCallback" am: a805d39229 am: 51f11f9b0b am: aab9659d41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644386

Change-Id: Iee971b6fdac174392e75e1ae49ef09446faf1257
 2021-03-19 11:31:03 +00:00
Zoey Chen
aab9659d41 Merge "[Telephony] Return if context is null when register TelephonyCallback" am: a805d39229 am: 51f11f9b0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644386

Change-Id: I8f6b72edbe920ae78b2a59dea4b3cd8e21ba47e1
 2021-03-19 10:46:18 +00:00
Zoey Chen
a805d39229 Merge "[Telephony] Return if context is null when register TelephonyCallback" 2021-03-19 09:28:41 +00:00
Amit Mahajan
265c424758 Merge "Clarifying documentation for SliceInfo per API council feedback." into sc-dev am: 69ef020c8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13903213

Change-Id: Id8479b683bd6cb20a6b8d64fb207cb9701d70e9e
 2021-03-19 02:46:14 +00:00
Amit Mahajan
69ef020c8e Merge "Clarifying documentation for SliceInfo per API council feedback." into sc-dev 2021-03-19 02:32:35 +00:00
SongFerng Wang
c1f7e65041 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev am: 026fa948ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13835347

Change-Id: I24b8cf474b9a81265495a02fe70a85b4c0e5a1fe
 2021-03-19 01:49:29 +00:00
Daniel Huang
d830a0620e Merge "Add configs for IMS Service Entitlement." into sc-dev am: 408440ed54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13738525

Change-Id: Ifea262e375dde5c07fd2af2204b7890f5c56d9a0
 2021-03-19 01:48:47 +00:00
SongFerng Wang
026fa948ae Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev 2021-03-19 01:28:31 +00:00
Daniel Huang
408440ed54 Merge "Add configs for IMS Service Entitlement." into sc-dev 2021-03-19 01:22:57 +00:00
Amit Mahajan
1ee17465ec Clarifying documentation for SliceInfo per API council feedback. 
Test: none; documentation only change
Bug: 180125761
Change-Id: Ic26598802d0648e7a12ed0ec78c01afc1a72598f
 2021-03-18 16:59:45 -07:00
Kai Shi
1224d2650b Merge "Add the LCE system API" am: 26ba4d0d09 am: 855075a2c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643471

Change-Id: I19a67dc2479548452f96c82e91c2a236ffbbf8ad
 2021-03-18 22:46:08 +00:00
Amit Mahajan
f36b5ff898 Merge "Clarifying documentation for SliceInfo per API council feedback." am: afb77c6f83 am: ddc8641c01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642743

Change-Id: I7d19ab42485cf0e119efddf1ae98e7a298a3af64
 2021-03-18 22:44:53 +00:00
Amit Mahajan
5e01b0d82a Merge "Rename SliceInfo to NetworkSliceInfo." into sc-dev am: 463ec227c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13837768

Change-Id: I45b1ab49d72038bdf7b8192fec2fe468e872cf13
 2021-03-18 22:17:02 +00:00
Kai Shi
26ba4d0d09 Merge "Add the LCE system API" 2021-03-18 21:23:34 +00:00
Amit Mahajan
463ec227c6 Merge "Rename SliceInfo to NetworkSliceInfo." into sc-dev 2021-03-18 20:20:13 +00:00
danielwbhuang
8744fc01dd Add configs for IMS Service Entitlement. 
1. KEY_FCM_SENDER_ID_STRING
2. KEY_SHOW_VOWIFI_WEBVIEW_BOOL
3. KEY_IMS_PROVISIONING_BOOL

Bug: 181634035
Test: make.
Change-Id: Ife460f3bb4ec71bbce66733dd4a0049c4ab3a2a9
 2021-03-18 17:59:07 +08:00
SongFerngWang
c42f2697d0 KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray 
Bug: 179814490
Test: build pass
Change-Id: Ica29b8aee243168bb7719f01972075d54ff763e9
 2021-03-18 11:39:23 +08:00
Zoey Chen
8eac3a3ff1 [Telephony] Return if context is null when register TelephonyCallback 
Bug: 183064691
Test: make
Change-Id: Ic77a6085f05c942dcd7514bc78b7bfa46938ec38
 2021-03-18 11:05:12 +08:00
Calvin Pan
af92749138 Merge "Add a carrier config for PROVISIONING button in radioinfo" into sc-dev am: 4e94266881 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13775005

Change-Id: I441b8cf5e7cf7c548fd90b5bf30e805f9baa135f
 2021-03-18 02:38:10 +00:00
Calvin Pan
4e94266881 Merge "Add a carrier config for PROVISIONING button in radioinfo" into sc-dev 2021-03-18 02:02:05 +00:00
Kai Shi
857391f361 Add the LCE system API 
Add the link capacity estimate system API.
Remove the system API of getCarrierBandwidth() and CarrierBandwidth as
they are replaced by the new LCE system API in PhoneStateListener.

Bug: 180434672
Bug: 176814680
Test: manual test of the new LCE system API in LinkBandwidthEstimator
Test: atest -c PhoneStateListenerTest

Merged-In: I5899acf02006a164e31f9b82aeaa7974dd6d2869
Change-Id: I5899acf02006a164e31f9b82aeaa7974dd6d2869
 2021-03-17 18:56:11 -07:00
Hall Liu
0f5d0cb2d9 Merge "Add carrier config keys for RTT-VT compat" am: 2ab1cc0fac am: 4b4f0e38a1 am: 0c9184f87e am: 9e53260ddb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636900

Change-Id: I8dd5befdd4cdddf3545a700fc9cfb268ba35a295
 2021-03-17 22:21:30 +00:00
Hall Liu
9e53260ddb Merge "Add carrier config keys for RTT-VT compat" am: 2ab1cc0fac am: 4b4f0e38a1 am: 0c9184f87e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636900

Change-Id: I6e6c51d5a6d98f524e37a61000f974afe269e6b1
 2021-03-17 22:08:20 +00:00
Michele Berionne
b33cb0e369 Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" am: 11773facb7 am: 8e7f7303cf am: a3e52d2724 am: ea591f8914 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613109

Change-Id: Ib08357a8d9ea1c824dd003cf29223e23ed0036c5
 2021-03-17 21:06:28 +00:00
Amit Mahajan
51937be778 Clarifying documentation for SliceInfo per API council feedback. 
Test: none; documentation only change
Bug: 180125761
Change-Id: Ic26598802d0648e7a12ed0ec78c01afc1a72598f
 2021-03-17 11:06:59 -07:00
Michele Berionne
ea591f8914 Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" am: 11773facb7 am: 8e7f7303cf am: a3e52d2724 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613109

Change-Id: I9fde6ebeeb2dd5ad38847317198cd05a8b29c0f1
 2021-03-17 16:07:58 +00:00
Calvin Pan
2260d0b1ba Add a carrier config for PROVISIONING button in radioinfo 
Use carrier config instead of hardcode the package name in AOSP

Bug: 181869486
Test: By manual
1. Override carrier config
2. Click the CARRIER_PROVISIONING button

Change-Id: I8106c631aab918db518936b3ac74be1683d4d8f0
 2021-03-17 14:18:32 +08:00
Sarah Chin
0b322ce535 Merge "setCdmaSubscription/RoamingMode returns when not CDMA" into sc-dev am: 1c97b8d767 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13862397

Change-Id: I9ed687fbbf4a7384d24bfdfbed0ac8074443a74b
 2021-03-17 01:00:11 +00:00
Sarah Chin
1c97b8d767 Merge "setCdmaSubscription/RoamingMode returns when not CDMA" into sc-dev 2021-03-17 00:36:06 +00:00
Hall Liu
0c9184f87e Merge "Add carrier config keys for RTT-VT compat" am: 2ab1cc0fac am: 4b4f0e38a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636900

Change-Id: Ie917e29b77236665308dde0384d88073b6439125
 2021-03-16 23:54:42 +00:00
Hall Liu
2ab1cc0fac Merge "Add carrier config keys for RTT-VT compat" 2021-03-16 23:21:34 +00:00
Hall Liu
3c8e0867fa Merge "Add carrier config keys for GBA" into sc-dev am: c4a9f8fa91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13832569

Change-Id: Ic97b1c078121a667909db068a718d92a975637a3
 2021-03-16 22:34:39 +00:00
Hall Liu
c4a9f8fa91 Merge "Add carrier config keys for GBA" into sc-dev 2021-03-16 21:54:09 +00:00
Kai Shi
f67e110ecb Merge "Revert "Revert "Add the LCE system API""" into sc-dev am: a2dce61157 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13887905

Change-Id: I57aaa77267f65c2f79c84459e71bb1680cb48b44
 2021-03-16 21:35:18 +00:00
Kai Shi
a2dce61157 Merge "Revert "Revert "Add the LCE system API""" into sc-dev 2021-03-16 20:43:50 +00:00
Kai Shi
5d530fab23 Revert "Revert "Add the LCE system API"" 
This reverts commit 8d60c5ceb4.

Reason for revert: <this CL doesn't break error prone build. Will redo the CTS one which does break the build>

Change-Id: I5899acf02006a164e31f9b82aeaa7974dd6d2869
Bug: 182869926
 2021-03-16 20:38:38 +00:00
Etan Cohen
4bd76a661f Merge "[Provider Model] Carrier configurations to allow CWF configurations" into sc-dev am: 1bc1a19b4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13823070

Change-Id: Iae81bfc9ffcbca3f39e795fccd3d0a15e4842a81
 2021-03-16 19:17:49 +00:00
Etan Cohen
1bc1a19b4d Merge "[Provider Model] Carrier configurations to allow CWF configurations" into sc-dev 2021-03-16 19:03:28 +00:00
Michele Berionne
a3e52d2724 Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" am: 11773facb7 am: 8e7f7303cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613109

Change-Id: I8636f713d0c81e8b7796e24efa7b41e3b17ede86
 2021-03-16 16:00:01 +00:00
Michele Berionne
11773facb7 Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" 2021-03-16 14:55:58 +00:00
TreeHugger Robot
33ccbe0f3b Merge "Revert "Add the LCE system API"" into sc-dev am: 3f31bd0578 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13878517

Change-Id: I02e94a2b06e90fc2b8103ea5ffac2aebbd715c3c
 2021-03-16 13:05:08 +00:00
Martijn Coenen
8d60c5ceb4 Revert "Add the LCE system API" 
Revert "Add CTS test for onLinkCapacityEstimateChanged"

Revert "[Telephony] Notify onLinkCapacityEstimateChanged"

Revert "Remove the system API of getCarrierBandwidth()"

Revert submission 13662828-LceApi

Reason for revert: b/182869926, breaks errorprone
Reverted Changes:
I1998c7e49:Add CTS test for onLinkCapacityEstimateChanged
Id69fa8b7a:Integrate New LCE Api
I0cc020ba3:Remove the system API of getCarrierBandwidth()
Id613dc152:Add the LCE system API
If7cede0f4:[Telephony] Notify onLinkCapacityEstimateChanged

Change-Id: I30813c321509ac44fa0119b0ce905fd28b0f139c
 2021-03-16 09:45:23 +00:00
Kai Shi
cdf5a561ab Merge "Add the LCE system API" into sc-dev am: a6c9e47218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428754

Change-Id: I81eff64282ef66941beb26f7d8c1cc7067f031ee
 2021-03-16 06:08:48 +00:00
Hall Liu
f4eae0f0e3 Add carrier config keys for RTT-VT compat 
Some carriers don't allow downgraded RTT calls to be upgraded to VT or
vice versa. Add carrier config keys to capture this behavior.

Bug: 175659924
Test: NA
Change-Id: I03916e1fab9abe58733c06f351b6846ddc29f337
 2021-03-15 16:06:48 -07:00
Michele Berionne
46af911ec8 Clarification for PREPARE_UNATTENDED_REBOOT_ERROR 
Bug: 181036567
Test: make
Change-Id: I1822930d9ce05d2efdd05568e9df52a4e7ad0572
 2021-03-15 22:49:54 +00:00
Kai Shi
df3e93af96 Add the LCE system API 
Add the link capacity estimate system API.
Remove the system API of getCarrierBandwidth() and CarrierBandwidth as
they are replaced by the new LCE system API in PhoneStateListener.

Bug: 180434672
Bug: 176814680
Test: manual test of the new LCE system API in LinkBandwidthEstimator
Test: atest -c PhoneStateListenerTest
Change-Id: Id613dc152e524045a89295e5dd03171b22377e16
 2021-03-15 15:00:01 -07:00
Sooraj Sasindran
2ebe098220 Merge "Allow REQUEST_NOT_SUPPORTED for nr dual connectivity config" am: 58489d1d48 am: 0c2d670abd am: 49d805a300 am: 16357f8411 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1632120

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3ed9c3aaf37069d559fbd6d1558f29c8fc9595a
 2021-03-15 07:00:05 +00:00
Sooraj Sasindran
16357f8411 Merge "Allow REQUEST_NOT_SUPPORTED for nr dual connectivity config" am: 58489d1d48 am: 0c2d670abd am: 49d805a300 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1632120

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2981c7920f9a11706fc069151fb534ef167c0796
 2021-03-15 06:40:47 +00:00
Sooraj Sasindran
49d805a300 Merge "Allow REQUEST_NOT_SUPPORTED for nr dual connectivity config" am: 58489d1d48 am: 0c2d670abd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1632120

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07108ba6341603b52ecf7c4d86a97e2818969834
 2021-03-15 05:56:51 +00:00