Commits · ea00dc0f4fb3e549e5c9f402afafe22ecaa62bf9 · Farzin Kazemzadeh / platform_frameworks_base-old

Apr 15, 2024

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26942270'] into 24Q2-release. · ea00dc0f
Android Build Coastguard Worker authored 11 months ago
```
Change-Id: I9d9d2e809cb9536c9a60fbb54cb086c0dfcc5503
```
ea00dc0f

Revert^2 [Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true · 92ef0bd6

Evan Laird authored 11 months ago

The carrier config key INFLATE_SIGNAL_STRENGTH instructs SystemUI to
create a 5-level mobile icon, as well as instructs us to add 1 to the
level reported from telephony. This change ensure that that is
happening.

Test: MobileConnectionRepositoryTest
Test: MobileIconInteractorTest
Test: MobileIconViewModelTest
Bug: 328547883
Flag: NONE
(cherry picked from commit 5166fa4c)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1cdce9bf0b146fdea0d3c0c6bdd23a21c51eb0de)
Merged-In: I450a583974986931c5442bfec5a82bcfdb43559f
Change-Id: I450a583974986931c5442bfec5a82bcfdb43559f

92ef0bd6

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26909021',... · 86c39bc3

Android Build Coastguard Worker authored 11 months ago

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26909021', 'googleplex-android-review.googlesource.com/26968636', 'googleplex-android-review.googlesource.com/26970063'] into 24Q2-release.

Change-Id: Ica24dd1bd4de67fefdb5602bfa2ea3f0a1f96755

86c39bc3

Revert^2 [Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true · d3715a17

Evan Laird authored 11 months ago

The carrier config key INFLATE_SIGNAL_STRENGTH instructs SystemUI to
create a 5-level mobile icon, as well as instructs us to add 1 to the
level reported from telephony. This change ensure that that is
happening.

Test: MobileConnectionRepositoryTest
Test: MobileIconInteractorTest
Test: MobileIconViewModelTest
Bug: 328547883
Flag: NONE
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5166fa4c7f7d914fbdf0076a322e721ea47023fd)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:342240ff8d91be116e5c3db2365551d6fea69db6)
Merged-In: I450a583974986931c5442bfec5a82bcfdb43559f
Change-Id: I450a583974986931c5442bfec5a82bcfdb43559f

d3715a17

Update media_controls_lock_screen setting behavior · 1fbaf01e

Beth Thibodeau authored 11 months ago

When the setting is disabled, hide the media carousel everywhere when
the device is on lockscreen, not just in the keyguard layout

Bug: 314333719
Test: manual
Test: atest MediaCarouselControllerTest
Flag: NONE

(cherry picked from commit f8371635)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:79af27be82294c31a161b61c1f853f9e59fa25a7)
Merged-In: I4f618e4013db894291e6fca9d49bceb1cb7e4bd9
Change-Id: I4f618e4013db894291e6fca9d49bceb1cb7e4bd9

1fbaf01e

[Mobile] Wrap AccessibilityContentDescriptions in a static getter · 55f949d4

Evan Laird authored 11 months ago

The content descriptions are mapped to level by their position in the
PHONE_SIGNAL_STRENGTH array, and thus are susceptible to out of bounds
index exceptions.

This change adds accessor methods to AccessibilityContentDescriptions
so that they can be checked (it's the responsibility of the caller to
check against a 0 return value which will throw if trying to get the
resource).

We also make the content description nullable and handle the resid=0
case.

Test: MobileIconViewModelTest
Bug: 328547883
Flag: NONE
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6e67f7d49206325e9f0fd0189b8b3a1c5a2094a8)
Merged-In: Ifa55ad8184a5337390d9fa245311b4e9513c0233
Change-Id: Ifa55ad8184a5337390d9fa245311b4e9513c0233

55f949d4

Apr 13, 2024

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26949279'] into 24Q2-release. · d7ca88dd
Android Build Coastguard Worker authored 11 months ago
```
Change-Id: Ic26de9c66818955363e762d6ddd15ae35cdb7b9a
```
d7ca88dd

Revert "Update media_controls_lock_screen setting behavior" · 90541c78

Ankur Bakshi authored 11 months ago

This reverts commit 37bdd2c2.

Reason for revert: Fix Build Red on AP2A.240605.002

Bug: 314333719
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3984eeaf4e4c80e60dfb00b2197b526689db68c5)
Merged-In: Ia2b3c4f59749a0332eae06c27d7565e8141116dd
Change-Id: Ia2b3c4f59749a0332eae06c27d7565e8141116dd

90541c78

Apr 12, 2024

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26948447'] into 24Q2-release. · 3904558d
Android Build Coastguard Worker authored 11 months ago
```
Change-Id: I334db150aad46ff94197e13fa1ef1ec70d5dd066
```
3904558d

Revert "[CDM][CMD] Check permissions for CDM shell commands" · 324e370c

Ankur Bakshi authored 11 months ago

This reverts commit db719819.

Reason for revert: Fix Build Red on AP2A.240605.001
Bug: 313428840
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:422377f47dc622dde8b96099d2bc7313a8d62da8)
Merged-In: I2fc381acc8a97d9df373f09da08c25578bc9cef4
Change-Id: I2fc381acc8a97d9df373f09da08c25578bc9cef4

324e370c

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26332012',... · e5623018

Android Build Coastguard Worker authored 11 months ago

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26332012', 'googleplex-android-review.googlesource.com/25839618', 'googleplex-android-review.googlesource.com/26551922', 'googleplex-android-review.googlesource.com/26567208', 'googleplex-android-review.googlesource.com/26637250', 'googleplex-android-review.googlesource.com/26307234', 'googleplex-android-review.googlesource.com/26720245', 'googleplex-android-review.googlesource.com/26703705', 'googleplex-android-review.googlesource.com/26882065', 'googleplex-android-review.googlesource.com/26906856', 'googleplex-android-review.googlesource.com/26929048', 'googleplex-android-review.googlesource.com/26932239'] into 24Q2-release.

Change-Id: I0fe91f3010e826c045f0127fc55deec6ae01569c

e5623018

[CDM][CMD] Check permissions for CDM shell commands · db719819

Guojing Yuan authored 1 year ago

Override handleShellCommand instead of onShellCommand because
Binder.onShellCommand checks the necessary permissions of the caller.

Bug: 313428840

Test: manually tested CDM shell commands
(cherry picked from commit 1761a0fe)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1f31bb181fc56f3deab5ce0d199220404991c438)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4cce7220b8ab86c5e8d06c99bfd4e8d046e3637b)
Merged-In: I5539b3594feb5544c458c0fd1061b51a0a808900
Change-Id: I5539b3594feb5544c458c0fd1061b51a0a808900

db719819

Inline notification_row_user_context · ac5d9057

Matías Hernández authored 11 months ago

Bug: 317503801
Test: atest ExpandableNotificationRowTest
Flag: ACONFIG com.android.systemui.notification_row_user_context NEXTFOOD
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:55176f645a463ad0ac3259e8330406b058104fba)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0b3ab98ca892dca961fb1bbbe98462a8c584dbcc)
Merged-In: Id07dc8feb39b08b38300ab3f73f98f602dc2a0db
Change-Id: Id07dc8feb39b08b38300ab3f73f98f602dc2a0db

ac5d9057

Revert "AudioService: optimize BT device config change" · 01f50f59

Eric Laurent authored 11 months ago

This reverts commit 023c69fc.

Reason for revert: 322938249
Bug:322938249
Test: make
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:67e7c84f438197ecc6c8572094dcd11e7aace488)
Merged-In: Ic3ddcfaf29ca79d96ef2e0ff0df180d527ea8dfd
Change-Id: Ic3ddcfaf29ca79d96ef2e0ff0df180d527ea8dfd

01f50f59

Merge changes from topic "fbe-wipe-no-reboot" into main am: am: · bad78169

Nikolay Elenkov authored 11 months ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3008298



Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:05b1440e06c84212b4353be7f5cbe97fd1bccafb)
Merged-In: Ia6d83f7582ce0d976c857c7318a1f9ed1fe3bae8
Change-Id: Ia6d83f7582ce0d976c857c7318a1f9ed1fe3bae8

bad78169

AccessibilityManagerService: remove uninstalled services from enabled list after service update. · fcac9b6f

Ameer Armaly authored 1 year ago

Bug: 326485767
Test: atest AccessibilityEndToEndTest#testUpdateServiceWithoutIntent_disablesService
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:74ab528e54558b5a78a9b0f32a2e3f0a61714ae5)
Merged-In: I2d986dc8f09a3cf2f31713237e69e15dcef84514
Change-Id: I2d986dc8f09a3cf2f31713237e69e15dcef84514

fcac9b6f

Add more checkKeyIntent checks to AccountManagerService. · db6705d5

Dmitry Dementyev authored 11 months ago

Another verification is needed after Bundle modification.
Bug: 321941232
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:36db8a1d61a881f89fdd3911886adcda6e1f0d7f)
Merged-In: I9e45d758a2320328da5664b6341eafe6f285f297
Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297

db6705d5

Fix error handling for non-dynamic permissions · f02c71c2

Yi-an Chen authored 1 year ago

We only allow removing dynamic permissions. When removePermission() is
called for a non-dynamic permission, in addition to logging it, we
should also return early to avoid the removePermission() call.

Test: manual
Bug: 321555066
Fixes: 321711213
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:528a87e90ff9354581d54fd37fbe9f95cccbcdb1)
Merged-In: Ie2f43663bc71a06ffadb868d2d0eea5ee78f76e5
Change-Id: Ie2f43663bc71a06ffadb868d2d0eea5ee78f76e5

f02c71c2

Update media_controls_lock_screen setting behavior · 37bdd2c2

Beth Thibodeau authored 11 months ago

When the setting is disabled, hide the media carousel everywhere when
the device is on lockscreen, not just in the keyguard layout

Bug: 314333719
Test: manual
Test: atest MediaCarouselControllerTest
Flag: NONE
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f837163596ca6fef691e1931223209002cf3d9d0)
Merged-In: I4f618e4013db894291e6fca9d49bceb1cb7e4bd9
Change-Id: I4f618e4013db894291e6fca9d49bceb1cb7e4bd9

37bdd2c2

[Autofill Framework] Add in check for intent filter when · b24668cc

Haoran Zhang authored 1 year ago

setting/updating service

For test, I registered two tests around on ABTD. CtsAutoFillServiceTestCases module is passing except three known failures:

Test run link:
- https://android-build.corp.google.com/builds/abtd/run/L33300030002610600
- https://android-build.corp.google.com/builds/abtd/run/L58100030002616607


Bug: b/324874908
Test: atest CtsAutoFillServiceTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:141d9d050346bfc4673c429382deb1b3d210f6ad)
Merged-In: I51c2e3788ac29ff4d6b86aa2a735ff2ea1463a77
Change-Id: I51c2e3788ac29ff4d6b86aa2a735ff2ea1463a77

b24668cc

[Bugfix]migrate user restrictions to DevicePolicyEngine · 3713f412

Wen Zhang authored 1 year ago

Migrate user restrictions to DevicePolicyEngine, otherwise user restrictions will not be able to be queried when upgrading from Android 13 OTA to Android 14.

Bug: 323452689
Bug: 318497672
Test: case 1:Android 13 upgrade to Android 14
1.install TestDPC on Android 13
2.set TestDPC as Device Owner
3.set disallow factory reset
4.update Android 14 via OTA
5.The reset to factory settings in the settings app is still unavailable.

case 2:Android 14(bad version) upgrade to Android 14(new version)
1.install TestDPC on Android 13
2.set TestDPC as Device Owner
3.set disallow factory reset
4.update Android 14(bad version) via OTA
5.The reset to factory settings in the settings app is still available.
6.update Android 14(new version) via OTA
7.The reset to factory settings in the settings app is unavailable.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:470c1eabca9f341e163a38a2327615e8fa3126ae)
Merged-In: I7c63d52300a1c5aa0678f29c2e4b15195411517c
Change-Id: I7c63d52300a1c5aa0678f29c2e4b15195411517c

3713f412

Fix bug in screen capture and lock task migrations · dd8f08e1

Kholoud Mohamed authored 1 year ago

Bug: 318497672
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:996050c7ce41b6bbf93010bcaa1d490fd470d07a)
Merged-In: Id0ac7d06b57f690d114217f2a34c2a1e8c60a277
Change-Id: Id0ac7d06b57f690d114217f2a34c2a1e8c60a277

dd8f08e1

Check for NLS bind permission when rebinding services · 56ed8ebb

Valentin Iftime authored 1 year ago

 Also, after updating packages with NLS components, check
 the approved services and remove from approved list if missing permissions.

Test: atest ManagedServicesTest
Bug: 321707289
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:24b13a64f9f5e5aa7f45a2132806d6c74e2c62dc)
Merged-In: I11901755ec430c6e3145def9d67e4e63cda00806
Change-Id: I11901755ec430c6e3145def9d67e4e63cda00806

56ed8ebb

Apr 10, 2024

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26832999',... · f6579776

Android Build Coastguard Worker authored 11 months ago

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26832999', 'googleplex-android-review.googlesource.com/26877731', 'googleplex-android-review.googlesource.com/26877737', 'googleplex-android-review.googlesource.com/26877738', 'googleplex-android-review.googlesource.com/26878334', 'googleplex-android-review.googlesource.com/26878335', 'googleplex-android-review.googlesource.com/26878463', 'googleplex-android-review.googlesource.com/26878464', 'googleplex-android-review.googlesource.com/26878465', 'googleplex-android-review.googlesource.com/26878466', 'googleplex-android-review.googlesource.com/26878737', 'googleplex-android-review.googlesource.com/26878738', 'googleplex-android-review.googlesource.com/26878741', 'googleplex-android-review.googlesource.com/26878828', 'googleplex-android-review.googlesource.com/26878829', 'googleplex-android-review.googlesource.com/26878830', 'googleplex-android-review.googlesource.com/26878831', 'googleplex-android-review.googlesource.com/26878834', 'googleplex-android-review.googlesource.com/26879463', 'googleplex-android-review.googlesource.com/26879775', 'googleplex-android-review.googlesource.com/26879790'] into 24Q2-release.

Change-Id: I6cd90cf3773399322d27937356dad219c1816d7d

f6579776