Commits · 1df8aac487cea70d0c0bcd759f8e6f6a1bfaaeee · Dhina17 / platform_frameworks_base

Sep 29, 2023

Merge "Move TentModeDeviceStateProvider to shared directory" into main · 1df8aac4
Nick Chameyev authored 1 year ago

1df8aac4
Merge "Add more dream logs" into main · a33d02f6
Philip Junker authored 1 year ago

a33d02f6
Merge "Use androidx FlakyTest annotation for device tests." into main · c1da6b6c
Anna Zhuravleva authored 1 year ago

c1da6b6c
Merge "Fix incorrect number formatting in dumpsys meminfo" into main · 6493643d
Kevin Jeon authored 1 year ago

6493643d

Merge changes I25e3d390,Iae392277 into main · fd173d1c

* changes:
  Use new Icon API to restrict showing some drawables
  Add a new hidden Icon API for loading

fd173d1c

Merge "Add disabled by policy state" into main · dc588bc5
Anton Potapov authored 1 year ago

dc588bc5
Merge "[flexiglass] Add a DeviceEntry module." into main · 102064b4
Danny Burakov authored 1 year ago

102064b4
Merge "Revert "Add FlickerServiceRule to splitscreen platinum tests"" into main · 683becc6
Pablo Gamito authored 1 year ago

683becc6

Add disabled by policy state · a0317a35

Anton Potapov authored 1 year ago

Test: atest DisabledByPolicyInteractorTest
Bug: 299908705
Change-Id: Id0636fe8fad326572384c9f187c9b5da7e060872

a0317a35

Use androidx FlakyTest annotation for device tests. · ca5711f5

Anna Zhuravleva authored 1 year ago

Platform_testing large test annotation is for
host side tests and will be restricted, device
tests should use androidx annotation.

Bug: 293837621
Test: build
Change-Id: Ic3efbe5c44235226aa1d5db3f10175775a01e992

ca5711f5

[flexiglass] Add a DeviceEntry module. · af001916

burakov authored 1 year ago

This module hosts business logic and state related to device entry, i.e.
 when the user successfully dismisses (or bypasses) the lockscreen. This
 is distinct from the authentication module, which is specifically
 concerned with determining a user's identity.

The names of certain state variables have changed, too:

* `isLockscreenDismissed` is now `isDeviceEntered`
* `canSwipeToDismiss` is now `canSwipeToEnter`
* `isLockscreenEnabled` is now `isInsecureLockscreenEnabled`

Bug: 301253588
Test: Existing unit tests still pass.
Test: Added new unit tests.
Test: Manually tested the 3 different bouncer auth methods, lockscreen
 bypass and swipe, and verified they still work as expected.
Change-Id: I9596513b4319eb0a9b9a25bee3a1c1726396e4ca

af001916

Merge "Update FlakyTest exclude-annotation for CtsPermissionUiTestCases" into main · 52948b07
Marvin Ramin authored 1 year ago

52948b07
Merge "Added missing framework-location compat config" into main · 89071467
Mark White authored 1 year ago

89071467
Merge "Cleanup flag LOAD_NOTIFICATIONS_BEFORE_THE_USER_SWITCH_IS_COMPLETE." into main · 99549087
Yasin Kilicdere authored 1 year ago

99549087

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am:... · 7de7765a

Xin Li authored 1 year ago

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: ee8af043 -s ours am: 81dd77b9 -s ours am: d0b7962c -s ours am: 623a7999 -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



Change-Id: I1c4d4e3235fbd9aaed0ce92b6225f2d1121debb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7de7765a

[automerger skipped] Merge UP1A.231005.007 am: -s ours am:... · 268738e3

Xin Li authored 1 year ago

[automerger skipped] Merge UP1A.231005.007 am: f984307b -s ours am: ac281ffd -s ours am: 927b4b9b -s ours am: f4890c29 -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



Change-Id: I02e2dba712ad7240fa303c59375ac777ec2c49ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

268738e3

Merge "Use androidx FlakyTest annotation for device tests." into main · 87d619ce
Anna Zhuravleva authored 1 year ago

87d619ce
Merge "Fix TaskView usage in DetailsDialog" into main · a681f86d
Anton Potapov authored 1 year ago

a681f86d
Merge "Remove ToastOutAnimatorListener on animation end" into main · 56167911
Iavor-Valentin Iftime authored 1 year ago

56167911
Merge "Deprecate a bunch of VDM APIs." into main · 6a28a132
Treehugger Robot authored 1 year ago

6a28a132
Merge "Use androidx FlakyTest annotation for device tests." into main · 3e22b660
Anna Zhuravleva authored 1 year ago

3e22b660

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am:... · 623a7999

Xin Li authored 1 year ago

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: ee8af043 -s ours am: 81dd77b9 -s ours am: d0b7962c -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



Change-Id: I7459698abc8cb000ec6a089889dc965df57a4857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

623a7999

[automerger skipped] Merge UP1A.231005.007 am: -s ours am:... · f4890c29

Xin Li authored 1 year ago

[automerger skipped] Merge UP1A.231005.007 am: f984307b -s ours am: ac281ffd -s ours am: 927b4b9b -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



Change-Id: If1dab9ff27e1611fc1d775bc57adc06d413b8121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f4890c29

Added missing framework-location compat config · 88599afa
Mark White authored 1 year ago
```
Fix: 301763182
Test: presubmit
Change-Id: I41e518047cd35e3c91438d8cc67e831148dbd834
```
88599afa

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am:... · d0b7962c

Xin Li authored 1 year ago

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: ee8af043 -s ours am: 81dd77b9 -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



Change-Id: I228c1d2bb13502c8248b3775f502c28943f79487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d0b7962c

[automerger skipped] Merge UP1A.231005.007 am: -s ours am: -s ours · 927b4b9b

Xin Li authored 1 year ago

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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

Change-Id: I25d07696ec0266b6e4db36b36b92770de79061e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

927b4b9b

Update FlakyTest exclude-annotation for CtsPermissionUiTestCases · 7b0ddaf1
Marvin Ramin authored 1 year ago
```
Bug: 302363575
Change-Id: I959c05b64e23088945656e47eaee09324613da54
Test: presubmit
```
7b0ddaf1

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: -s ours · 81dd77b9

Xin Li authored 1 year ago

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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

Change-Id: Ie76038a96321a0b0ca12a04c8c4d56dac1bf27b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

81dd77b9

[automerger skipped] Merge UP1A.231005.007 am: -s ours · ac281ffd

Xin Li authored 1 year ago

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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

Change-Id: Ifbdc306016c1a7e094ad9eac46c720f2acd708c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ac281ffd

Merge "Merge UP1A.231005.007" into aosp-main-future · ee8af043
Xin Li authored 1 year ago

ee8af043

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 727e36ff

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours am: 58d8f1e2 -s ours am: f59cf055 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I1c9036037554901ac2a838b15ab90cfe61149e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

727e36ff

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 42f6cb8e

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours am: 655266f8 -s ours am: 5a8fd865 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I0a02d5e80b044767e1059538d73fe1367f48a0d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

42f6cb8e

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 4ce1a5bb

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: 0542b70d -s ours am: 49e063af -s ours am: 6b62ae81 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I6e2b0eed8c08f3b98b069b6fd29ad9cd0590ac6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4ce1a5bb

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 51330ec6

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 6dfd94a1 -s ours am: 9e96ae63 -s ours am: 7cb70b90 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I788209499e3d61805400d82890d6dc92ca9af328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

51330ec6

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · b8551b77

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours am: cf11a619 -s ours am: 198e4c3c -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I3839862d58e0a51fe2e5700dbef5ef939ff0f9ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b8551b77

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · e123886b

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours am: 85a23a76 -s ours am: 1010f4ce -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Ia5023cb5c09ca97cd116e71580f9e8cec0fb9ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e123886b

Merge "Fix 'ConcurrentModificationException' issue" into main · 9ce9a575
David Zhao authored 1 year ago

9ce9a575

Fix 'ConcurrentModificationException' issue · 8afdc1c6

wei.jing authored 1 year ago

[Description]
solution for adding read and write protection to ‘mPendingAppPrivateCommands’.

[Test Report]
AC on/off PASS
can bootup to TvLauncher PASS
LiveTV open PASS
VTS/CTS cmd: NA
(cherry picked from https://partner-android-review.googlesource.com/q/commit:bc3a33fd8317bc43997721e51c18ce85543d6441)
Bug: 302245330
Merged-In: Ic80466518ca35c16dde74dbbaada92f28eaaf6ef
Change-Id: Ic80466518ca35c16dde74dbbaada92f28eaaf6ef

8afdc1c6

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · f59cf055

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours am: 58d8f1e2 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Ie58e426f46317db69137b57ec67e97f395fe1315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f59cf055

[automerger skipped] Merge "Restrict number of shortcuts can be added through... · 5a8fd865

Pinyao Ting authored 1 year ago

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours am: 655266f8 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Ieb780970be333ac9703952d25738c2d64db46cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5a8fd865