Commits · f1427ceeaeaeea2ad0931a92f6f362100bccf412 · Dhina17 / platform_frameworks_base

Oct 19, 2023

Add package name and user id to logging · f1427cee

Bug: 205124386
Test: Manually using zoom
Change-Id: I22d7318cf4392106459edb5d318d88c1ef668f74

f1427cee

Oct 16, 2023

Merge "Move RingtoneTest to media/tests/ringtone" into main · 13e29dc0
Lais Andrade authored 1 year ago

13e29dc0
Merge "Apply dynamic policy flag in VirtualDeviceImpl" into main · e3f07fdc
Marvin Ramin authored 1 year ago

e3f07fdc

[automerger skipped] Merge "Adding OWNERS to foldable folder." into main am:... · f07c68a5

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Adding OWNERS to foldable folder." into main am: 526620ee am: de20ae1f am: 29d1a0aa am: af5ca97d am: af5511af -s ours

am skip reason: Merged-In I62edbb8565a248dd4ac58f80f0b16fab154deab7 with SHA-1 dc45d474 is already in history

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



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

f07c68a5

Merge "No need to check product vndk version" into main am: am:... · 64b678f4

Kiyoung Kim authored 1 year ago

Merge "No need to check product vndk version" into main am: 8fa8c076 am: b056db1d am: 2d41e533 am: 1d6d282e am: ac82ecf7

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

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

64b678f4

Merge "Enable multi_display_screenshot in sysui teamfood" into main · e8ae5d69
Nicolò Mazzucato authored 1 year ago

e8ae5d69
Merge "Remove unused parameter in callback" into main · 7f197298
Santiago Seifert authored 1 year ago

7f197298

Merge "Adding OWNERS to foldable folder." into main am: am:... · af5511af

Treehugger Robot authored 1 year ago

Merge "Adding OWNERS to foldable folder." into main am: 526620ee am: de20ae1f am: 29d1a0aa am: af5ca97d

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

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

af5511af

Merge "No need to check product vndk version" into main am: am:... · ac82ecf7

Kiyoung Kim authored 1 year ago

Merge "No need to check product vndk version" into main am: 8fa8c076 am: b056db1d am: 2d41e533 am: 1d6d282e

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

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

ac82ecf7

Merge "Fix broken framework documentation" into main · ed4f50f3
Anton Hansson authored 1 year ago

ed4f50f3

Merge "Adding OWNERS to foldable folder." into main am: am: am: · af5ca97d

Treehugger Robot authored 1 year ago

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

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

af5ca97d

Merge "No need to check product vndk version" into main am: am:... · 1d6d282e

Kiyoung Kim authored 1 year ago

Merge "No need to check product vndk version" into main am: 8fa8c076 am: b056db1d am: 2d41e533

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

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

1d6d282e

Merge "Adding OWNERS to foldable folder." into main am: am: · 29d1a0aa

Treehugger Robot authored 1 year ago

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

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

29d1a0aa

Merge "No need to check product vndk version" into main am: am: · 2d41e533

Kiyoung Kim authored 1 year ago

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

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

2d41e533

Merge "do wom: fix potential issue of VirtualDisplay's callback not called" into main · 5c205325
Chen Bai authored 1 year ago

5c205325
Merge "Revert "Run normal finish for entering standalone recents activity"" into main · b3550a95
Uwais Ashraf authored 1 year ago

b3550a95

Merge "Adding OWNERS to foldable folder." into main am: · de20ae1f

Treehugger Robot authored 1 year ago

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

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

de20ae1f

Revert "Run normal finish for entering standalone recents activity" · 2f3bd578

Uwais Ashraf authored 1 year ago

Revert submission 24941288-b302703228

Reason for revert: Most likely cause of droidmonitored test failures. b/305629625. Original change was merged at this point https://screenshot.googleplex.com/99p3F266XUYYbA2 causing a 100% failure on main.

Reverted changes: /q/submissionid:24941288-b302703228

Bug: 305629625

Change-Id: Idcb7113db8c5c8cbd186f08ac66b67c0d4945833

2f3bd578

Merge "Adding OWNERS to foldable folder." into main · 526620ee
Treehugger Robot authored 1 year ago

526620ee

Merge "No need to check product vndk version" into main am: · b056db1d

Kiyoung Kim authored 1 year ago

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

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

b056db1d

Merge "Don't apply UI width limitation to an external display" into main am:... · 78a533c5

Riddle Hsu authored 1 year ago

Merge "Don't apply UI width limitation to an external display" into main am: 31331ed8 am: c7ddd492 am: a55cc161 am: d8f8e663 am: d93f2153

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

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

78a533c5

Merge "No need to check product vndk version" into main · 8fa8c076
Kiyoung Kim authored 1 year ago

8fa8c076

Merge "Don't apply UI width limitation to an external display" into main am:... · d93f2153

Riddle Hsu authored 1 year ago

Merge "Don't apply UI width limitation to an external display" into main am: 31331ed8 am: c7ddd492 am: a55cc161 am: d8f8e663

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

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

d93f2153

Merge "Don't apply UI width limitation to an external display" into main am:... · d8f8e663

Riddle Hsu authored 1 year ago

Merge "Don't apply UI width limitation to an external display" into main am: 31331ed8 am: c7ddd492 am: a55cc161

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

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

d8f8e663

Merge "Reduce unnecessary surface operation of setting trusted overlay" into main · 740da917
Riddle Hsu authored 1 year ago

740da917

do wom: fix potential issue of VirtualDisplay's callback not called · 29d0aa0f

Chen Bai authored 1 year ago

- Remove requestDisplayStateLocked version without displayoffload &
  enforce VirtualDisplayAdapter to implement the new
  requestDisplayStateLocked.
- Fix tests.

Test: atest DisplayManagerServiceTest && atest LocalDisplayAdapterTest
BUG: 304944369
Change-Id: I1ec351e6280088b301662cdb0af6ad24f84fc93e

29d0aa0f

Merge "Don't apply UI width limitation to an external display" into main am:... · a55cc161

Riddle Hsu authored 1 year ago

Merge "Don't apply UI width limitation to an external display" into main am: 31331ed8 am: c7ddd492

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

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

a55cc161

Merge "Don't apply UI width limitation to an external display" into main am: · c7ddd492

Riddle Hsu authored 1 year ago

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

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

c7ddd492

Merge "Refactor screenshot logging in case of external display" into main · d64b75d5
Nicolò Mazzucato authored 1 year ago

d64b75d5
Merge "Don't apply UI width limitation to an external display" into main · 31331ed8
Riddle Hsu authored 1 year ago

31331ed8
Merge "Run normal finish for entering standalone recents activity" into main · 65c64840
Riddle Hsu authored 1 year ago

65c64840

[automerger skipped] Merge "Add android_core_networking aconfig flag to... · 9c97ec97

Motomu Utsumi authored 1 year ago

[automerger skipped] Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160c am: 419b5bf7 am: 93981966 am: 1272f06d am: 8532fe3b -s ours

am skip reason: Merged-In I7031072c2cd98241bc70a6a29d026e2ef7e3c842 with SHA-1 a1123291 is already in history

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



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

9c97ec97

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main... · 8532fe3b

Motomu Utsumi authored 1 year ago

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160c am: 419b5bf7 am: 93981966 am: 1272f06d

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

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

8532fe3b

Merge "[Spa] Upgrade Compose to 1.6.0-alpha07" into main · 0673fea4
Chaohui Wang authored 1 year ago

0673fea4

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main... · 1272f06d

Motomu Utsumi authored 1 year ago

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160c am: 419b5bf7 am: 93981966

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

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

1272f06d

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main... · 93981966

Motomu Utsumi authored 1 year ago

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160c am: 419b5bf7

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

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

93981966

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: · 419b5bf7

Motomu Utsumi authored 1 year ago

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

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

419b5bf7

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test"... · bef66aca

Thiébaud Weksteen authored 1 year ago

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test" into main am: 663c9b34 am: 0b550caa am: a256a44f am: 549622b3 am: 95c1f287

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

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

bef66aca

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main · b400160c
Motomu Utsumi authored 1 year ago

b400160c

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test"... · 95c1f287

Thiébaud Weksteen authored 1 year ago

Merge "AndroidGlobalLintCheckerIntegrationTest: Add missing annotation test" into main am: 663c9b34 am: 0b550caa am: a256a44f am: 549622b3

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

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

95c1f287