Commits · f97df4d8a6e4ef1364244b0e9adefc08c3f95c06 · halogenOS / android_frameworks_native

Dec 06, 2023

Alec Mouri authored 1 year ago

* Make sure we don't dim SDR in renderengine, and instead map HDR to the
  correct relative luminance above 1.0
* Plumb the HDR/SDR ratio into HWC

Bug: 236745178
Test: builds
Change-Id: I325972a01280d287189d38dd6c5bf7f2d4b776bb

f97df4d8

Dec 05, 2023

Merge "Add isProtected flag to Output" into main · d6a6f38c
Chavi Weingarten authored 1 year ago

d6a6f38c

Merge "Resume interrupted restorecon in a separate thread." into main am:... · 0face556

Alex Buynytskyy authored 1 year ago

Merge "Resume interrupted restorecon in a separate thread." into main am: f1e4a205 am: d95de6bf am: 6adde184

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2850152

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

0face556

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am:... · ee23893d

Yi Kong authored 1 year ago

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am: 459c2317 am: 18ccbd44 -s ours am: 74e1f7be -s ours

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391



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

ee23893d

Merge "Resume interrupted restorecon in a separate thread." into main am:... · 513e1d1d

Alex Buynytskyy authored 1 year ago

Merge "Resume interrupted restorecon in a separate thread." into main am: f1e4a205 am: e4e7c515 am: fb2ba2eb

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2850152

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

513e1d1d

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am:... · f2426dbb

Yi Kong authored 1 year ago

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am: 459c2317 -s ours am: 25e99c59 -s ours am: b55d9cfc -s ours

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391



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

f2426dbb

[automerger skipped] Fix -Wformat compiler warning am: -s ours am:... · 9f6ec48c

Yi Kong authored 1 year ago

[automerger skipped] Fix -Wformat compiler warning am: 906306ca -s ours am: cfce607c -s ours am: 4af826a8 -s ours

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391



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

9f6ec48c

Merge "Resume interrupted restorecon in a separate thread." into main am: am: · 6adde184

Alex Buynytskyy authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2850152

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

6adde184

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am:... · 74e1f7be

Yi Kong authored 1 year ago

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am: 459c2317 am: 18ccbd44 -s ours

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391



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

74e1f7be

Merge "Resume interrupted restorecon in a separate thread." into main am: am: · fb2ba2eb

Alex Buynytskyy authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2850152

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

fb2ba2eb

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am:... · b55d9cfc

Yi Kong authored 1 year ago

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am: 459c2317 -s ours am: 25e99c59 -s ours

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391



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

b55d9cfc

[automerger skipped] Fix -Wformat compiler warning am: -s ours am: -s ours · 4af826a8

Yi Kong authored 1 year ago

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391

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

4af826a8

Merge "Resume interrupted restorecon in a separate thread." into main am: · e4e7c515

Alex Buynytskyy authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2850152

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

e4e7c515

[automerger skipped] Merge "Fix -Wformat compiler warning" into main am: -s ours · 25e99c59

Yi Kong authored 1 year ago

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391

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

25e99c59

[automerger skipped] Fix -Wformat compiler warning am: -s ours · cfce607c

Yi Kong authored 1 year ago

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 38f6a09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391

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

cfce607c

Merge "Resume interrupted restorecon in a separate thread." into main am: · d95de6bf

Alex Buynytskyy authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2850152

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

d95de6bf

Merge "Fix -Wformat compiler warning" into main am: · 18ccbd44

Yi Kong authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858391

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

18ccbd44

Merge "Resume interrupted restorecon in a separate thread." into main · f1e4a205
Alex Buynytskyy authored 1 year ago

f1e4a205

Merge "Fix -Wunused-variable compiler warning" into main am: am:... · 907e5e0d

Yi Kong authored 1 year ago

Merge "Fix -Wunused-variable compiler warning" into main am: a0511750 am: e884c3c5 am: f1af754a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858055

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

907e5e0d

Merge "Fix -Wunused-variable compiler warning" into main am: am:... · 67e78e90

Yi Kong authored 1 year ago

Merge "Fix -Wunused-variable compiler warning" into main am: a0511750 am: 18e1c0d6 am: 4a6c9f10

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858055

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

67e78e90

Merge "Fix -Wformat compiler warning" into main · 459c2317
Yi Kong authored 1 year ago

459c2317

Add isProtected flag to Output · 18fa7c60

Chavi Weingarten authored 1 year ago

Allow outputs to decide if they want to render protected content, not
just if they support it. The current code checks if the Output is secure
when deciding whether to render protected content. By adding a new flag,
it will allow displays to decide if they want to render secure,
protected, or both.

This code doesn't have a way to create displays with only protected and
will still rely on the isSecure flag to ensure backwards compatibility.

Test: presubmit
Fixes: 285553970
Fixes: 300492271
Change-Id: If5e65388825d37f4ddaea5190259a136cfa89264

18fa7c60

Merge "Fix -Wunused-variable compiler warning" into main am: am: · f1af754a

Yi Kong authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858055

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

f1af754a

Merge "Fix -Wunused-variable compiler warning" into main am: am: · 4a6c9f10

Yi Kong authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858055

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

4a6c9f10

[automerger skipped] Fix -Wformat compiler warning am: am: -s ours · a4326c9f

Yi Kong authored 1 year ago

am skip reason: Merged-In I81868618064fbb189affb0f55c4e3ab94e78430b with SHA-1 d90ebf37 is already in history

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

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

a4326c9f

Merge changes from topics "pointer-icon-refactor-setPointerIcon",... · d9829999

Prabir Pradhan authored 1 year ago

Merge changes from topics "pointer-icon-refactor-setPointerIcon", "setPointerIcon-hitTest" into main

* changes:
  InputDispatcher: Add hit test method isPointerInWindow
  Address comments: Add setPointerIcon for PointerChoreographer
  Add setPointerIcon for PointerChoreographer

d9829999

Merge "Fix -Wunused-variable compiler warning" into main am: · 18e1c0d6

Yi Kong authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858055

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

18e1c0d6

Merge "Fix -Wunused-variable compiler warning" into main am: · e884c3c5

Yi Kong authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858055

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

e884c3c5

Fix -Wformat compiler warning am: · 9b6656c7

Yi Kong authored 1 year ago

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

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

9b6656c7

Merge "Fix -Wunused-variable compiler warning" into main · a0511750
Yi Kong authored 1 year ago

a0511750

Fix -Wformat compiler warning · 38f6a09c

Yi Kong authored 1 year ago

error: format specifies type 'int' but the argument has type 'ui::Dataspace' [-Werror,-Wformat]
   91 |     LOG_ALWAYS_FATAL("%s isTextureValid:%d dataspace:%d"
      |                                                      ~~
   92 |                      "\n\tGrBackendTexture: (%i x %i) hasMipmaps: %i isProtected: %i texType: %i"
   93 |                      "\n\t\tGrGLTextureInfo: success: %i fTarget: %u fFormat: %u colorType %i",
   94 |                      msg, tex.isValid(), dataspace, tex.width(), tex.height(), tex.hasMipmaps(),
      |                                          ^~~~~~~~~
      |                                          static_cast<int32_t>( )

Test: build with upstream Clang
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d90ebf37bac881823a701190afd871dbc7495624)
Merged-In: I81868618064fbb189affb0f55c4e3ab94e78430b
Change-Id: I81868618064fbb189affb0f55c4e3ab94e78430b

38f6a09c

Fix -Wformat compiler warning · 906306ca

Yi Kong authored 1 year ago

error: format specifies type 'int' but the argument has type 'ui::Dataspace' [-Werror,-Wformat]
   91 |     LOG_ALWAYS_FATAL("%s isTextureValid:%d dataspace:%d"
      |                                                      ~~
   92 |                      "\n\tGrBackendTexture: (%i x %i) hasMipmaps: %i isProtected: %i texType: %i"
   93 |                      "\n\t\tGrGLTextureInfo: success: %i fTarget: %u fFormat: %u colorType %i",
   94 |                      msg, tex.isValid(), dataspace, tex.width(), tex.height(), tex.hasMipmaps(),
      |                                          ^~~~~~~~~
      |                                          static_cast<int32_t>( )

Test: build with upstream Clang
Change-Id: I81868618064fbb189affb0f55c4e3ab94e78430b
Merged-In: I81868618064fbb189affb0f55c4e3ab94e78430b
(cherry picked from commit d90ebf37)

906306ca

Merge "Fix -Wformat compiler warning" into main · e74cd0ae
Yi Kong authored 1 year ago

e74cd0ae
Fix -Wunused-variable compiler warning · 6fcddef2
Yi Kong authored 1 year ago
```
Test: presubmit
Change-Id: Ic971c18541505b0ac49d1473a87523e8fdb8ab29
```
6fcddef2

Fix -Wformat compiler warning · d90ebf37

Yi Kong authored 1 year ago

error: format specifies type 'int' but the argument has type 'ui::Dataspace' [-Werror,-Wformat]
   91 |     LOG_ALWAYS_FATAL("%s isTextureValid:%d dataspace:%d"
      |                                                      ~~
   92 |                      "\n\tGrBackendTexture: (%i x %i) hasMipmaps: %i isProtected: %i texType: %i"
   93 |                      "\n\t\tGrGLTextureInfo: success: %i fTarget: %u fFormat: %u colorType %i",
   94 |                      msg, tex.isValid(), dataspace, tex.width(), tex.height(), tex.hasMipmaps(),
      |                                          ^~~~~~~~~
      |                                          static_cast<int32_t>( )

Test: build with upstream Clang
Change-Id: I81868618064fbb189affb0f55c4e3ab94e78430b

d90ebf37