Commits · ff5c518865e8793622db237adb993592556e5b54 · Dhina17 / platform_frameworks_base

Oct 20, 2023

Add defer display updates trunk stable flag · ff5c5188

Nick Chameyev authored 1 year ago

Creates defer display updates flag and
prepares unit test dependencies to
override the flag in WM tests.

Bug: 259220649
Test: atest DisplayContentTests
Test: compile and run tests locally
Change-Id: I94dcea319addd837c07825a6d85c5ea8aff6f63f

ff5c5188

Merge "Use keyguard transitions to ensure correct scrim" into main · 69b2fb83
Matt Pietal authored 1 year ago

69b2fb83
Merge "Revert "Revert "Change notifications service to listen to generic... · f2b3ab90
Olivier Nshimiye authored 1 year ago
```
Merge "Revert "Revert "Change notifications service to listen to generic profile availability intents""" into main
```
f2b3ab90
Merge "Fixing issues with minimal post processing and HDR conversion" into main · 5c0ac91c
Kriti Dang authored 1 year ago

5c0ac91c
Merge "Add logs and traces when draw doesn't run" into main · 69c57d24
Chavi Weingarten authored 1 year ago

69c57d24
Revert "Revert "Change notifications service to listen to generic profile availability intents"" · 9a1c2661
Olivier Nshimiye authored 1 year ago
```
This reverts commit e30aa408.

Reason for revert: resubmit

Change-Id: Ief897d6ebe709f66833c3f511f728e88a159b791
```
9a1c2661

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main... · 327d0071

Roshan Pius authored 1 year ago

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main am: 1b18e3d1 am: b4811b33 am: afc1e745

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

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

327d0071

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main... · d769199f

Roshan Pius authored 1 year ago

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main am: 1b18e3d1 am: 0a58878f am: cf43d6d6

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

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

d769199f

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main... · afc1e745

Roshan Pius authored 1 year ago

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main am: 1b18e3d1 am: b4811b33

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

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

afc1e745

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main... · cf43d6d6

Roshan Pius authored 1 year ago

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main am: 1b18e3d1 am: 0a58878f

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

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

cf43d6d6

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main am: · b4811b33

Roshan Pius authored 1 year ago

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

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

b4811b33

Merge "Alphabetize a11y aconfig flags to help limit merge conflicts." into main · 9648bead
Daniel Norman authored 1 year ago

9648bead

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main am: · 0a58878f

Roshan Pius authored 1 year ago

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

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

0a58878f

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main · 1b18e3d1
Roshan Pius authored 1 year ago

1b18e3d1

Revert "nfc(api): Dependencies to include in framework-nfc" · da8a5ebb

Roshan Pius authored 1 year ago

This reverts commit 869155b8.

Reason for revert: Causes build failure

Bug: 306523602
Change-Id: Ib3fffa498d1e645fc1b38eb61084564534fef72e
Test: N/A

da8a5ebb

[automerger skipped] Merge "nfc(api): Use settings key and feature string... · 2b14ff15

Roshan Pius authored 1 year ago

[automerger skipped] Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f6214326 am: dc8efa9b -s ours am: 62b17de3 -s ours

am skip reason: Merged-In Iecbf1b58ee2305c509da9c90cd421ee0cb91d379 with SHA-1 517e8a3f is already in history

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



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

2b14ff15

Merge "nfc(api): Use settings key and feature string since the API is @hide"... · 0b561d0c

Roshan Pius authored 1 year ago

Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f6214326 am: 74b083e6 am: 770be83e

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

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

0b561d0c

[automerger skipped] Merge "nfc(api): Dependencies to include in... · 17048ee0

Roshan Pius authored 1 year ago

[automerger skipped] Merge "nfc(api): Dependencies to include in framework-nfc" into main am: f661b30d am: e2479167 -s ours am: 9543d297 -s ours

am skip reason: Merged-In I6848686b892bec543f977d48e5410af444eb2f7c with SHA-1 869155b8 is already in history

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



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

17048ee0

Merge "nfc(api): Dependencies to include in framework-nfc" into main am:... · a484230e

Roshan Pius authored 1 year ago

Merge "nfc(api): Dependencies to include in framework-nfc" into main am: f661b30d am: 5a0afb14 am: faa4c2d5

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

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

a484230e

Merge "nfc(api): Create privileged setReaderMode API" into main am: ... · 0a580416

Roshan Pius authored 1 year ago

Merge "nfc(api): Create privileged setReaderMode API" into main am: d365063d am: b93ba4c4 am: 76168499

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

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

0a580416

Merge "nfc(api): Create privileged setReaderMode API" into main am: ... · ff676d2a

Roshan Pius authored 1 year ago

Merge "nfc(api): Create privileged setReaderMode API" into main am: d365063d am: 045bedbe am: e4eaf00f

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

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

ff676d2a

[automerger skipped] Merge "nfc(api): Use settings key and feature string... · 62b17de3

Roshan Pius authored 1 year ago

[automerger skipped] Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f6214326 am: dc8efa9b -s ours

am skip reason: Merged-In Iecbf1b58ee2305c509da9c90cd421ee0cb91d379 with SHA-1 517e8a3f is already in history

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



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

62b17de3

Merge "nfc(api): Use settings key and feature string since the API is @hide"... · 770be83e

Roshan Pius authored 1 year ago

Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f6214326 am: 74b083e6

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

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

770be83e

Merge "nfc(api): Use settings key and feature string since the API is @hide"... · dc8efa9b

Roshan Pius authored 1 year ago

Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f6214326

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

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

dc8efa9b

Merge "nfc(api): Use settings key and feature string since the API is @hide"... · 74b083e6

Roshan Pius authored 1 year ago

Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f6214326

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

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

74b083e6

Merge "nfc(api): Use settings key and feature string since the API is @hide" into main · f6214326
Roshan Pius authored 1 year ago

f6214326

[automerger skipped] Merge "nfc(api): Dependencies to include in... · 9543d297

Roshan Pius authored 1 year ago

[automerger skipped] Merge "nfc(api): Dependencies to include in framework-nfc" into main am: f661b30d am: e2479167 -s ours

am skip reason: Merged-In I6848686b892bec543f977d48e5410af444eb2f7c with SHA-1 869155b8 is already in history

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



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

9543d297

[automerger skipped] Merge "Add the "--ignore-dexopt-profile" option." into... · 8e48d3c8

Jiakai Zhang authored 1 year ago

[automerger skipped] Merge "Add the "--ignore-dexopt-profile" option." into main am: 66be198b am: 241bdded -s ours am: ae9c3ccc -s ours

am skip reason: Merged-In Ib933f3443346895c771ed16e4acc7591231d6645 with SHA-1 ff280d0e is already in history

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



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

8e48d3c8

Merge "Support HardwareBuffer in Rust." into main am: am: am: · 53265c27

Andrew Walbran authored 1 year ago

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

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

53265c27

[automerger skipped] Merge "Add the "--ignore-dexopt-profile" option." into... · 77da958e

Jiakai Zhang authored 1 year ago

[automerger skipped] Merge "Add the "--ignore-dexopt-profile" option." into main am: 66be198b am: a451cf07 am: ac6f66d5 -s ours

am skip reason: Merged-In Ib933f3443346895c771ed16e4acc7591231d6645 with SHA-1 f8d2e606 is already in history

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



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

77da958e

Merge "Support HardwareBuffer in Rust." into main am: am: am: · c4993ba9

Andrew Walbran authored 1 year ago

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

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

c4993ba9

[automerger skipped] Merge "Disable `sync_disabled_mode` in `DeviceConfigTest`... · 64d330f2

Gaurav Bhola authored 1 year ago

[automerger skipped] Merge "Disable `sync_disabled_mode` in `DeviceConfigTest` runs." into udc-qpr-dev am: c0359f8b am: 855c2ed6 -s ours

am skip reason: Merged-In I6347010d950e2e9b8be4285f7a9bd1602ffd5b46 with SHA-1 7b2d7fc4 is already in history

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



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

64d330f2

[automerger skipped] Merge "Fix HorizontalScrollViewFunctionaTest" into... · 4598c64f

Gaurav Bhola authored 1 year ago

[automerger skipped] Merge "Fix HorizontalScrollViewFunctionaTest" into udc-qpr-dev am: a59a744a am: fa0c281b -s ours

am skip reason: Merged-In I5342e21af8074e4a4ef69c79c63696f99cba436c with SHA-1 e2e039c9 is already in history

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



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