summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Ib9494d167e0d433adb05ce071df978d7dfe566f9 Change-Id: Idcb1fd03d1d1510aecf247759d7b2c5a23c5e46f
2023-10-06[automerger skipped] Merge Android 14 am: 7a8e11b03f -s ours am: 8ce8c110b3 ↵Xin Li
-s ours am: dc6def3e7c -s ours am: bc4d923b74 -s ours am skip reason: Merged-In I3b2cab79035664c64c6ed92852a9e935a728f259 with SHA-1 86d5075626 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2777050 Change-Id: Ib9494d167e0d433adb05ce071df978d7dfe566f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7a8e11b03f -s ours am: 8ce8c110b3 ↵Xin Li
-s ours am: dc6def3e7c -s ours am skip reason: Merged-In I3b2cab79035664c64c6ed92852a9e935a728f259 with SHA-1 86d5075626 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2777050 Change-Id: Idf4202dde33cc80325a5ffff497f976afb0dca9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7a8e11b03f -s ours am: 8ce8c110b3 ↵Xin Li
-s ours am skip reason: Merged-In I3b2cab79035664c64c6ed92852a9e935a728f259 with SHA-1 86d5075626 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2777050 Change-Id: I7b074d3ea8acb676afa4e370f53fa5292eb2f50f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7a8e11b03f -s oursXin Li
am skip reason: Merged-In I3b2cab79035664c64c6ed92852a9e935a728f259 with SHA-1 86d5075626 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2777050 Change-Id: I8e72dd58e6e8b209a2bf01cc269d0c9b9df95ed8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I3b2cab79035664c64c6ed92852a9e935a728f259 Change-Id: Ic6fb563984d45f52401b7807314d5dbb55ad5ddb
2023-09-19clang-format: add IncludeBlocks Preserve & PointerAlignment Left am: 4d110d9910Wiwit Rifa'i
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/24787731 Change-Id: I324755bf3d39151f565ed891e9f1afe4d201a2bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18clang-format: add IncludeBlocks Preserve & PointerAlignment LeftWiwit Rifa'i
We usually follow the same code style from framework/native. This will add some new rules that have been added to framework/native but not added here yet. Bug: 295892886 Test: git-clang-format Change-Id: I20cc56d52e63e350ec72cfe6c3aebbcb0d0a6fac
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 7322c79a77 -s ours ↵Xin Li
am: 2cc70ed53a -s ours am: 7d063815a5 -s ours am skip reason: Merged-In Ic513ddd99ef32dfc018c2ac9de0671781d6183cd with SHA-1 90f6cf2ef4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/24181976 Change-Id: I3f855f571380698311eebf1c001344fe21073098 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 7322c79a77 -s ours ↵Xin Li
am: 2cc70ed53a -s ours am skip reason: Merged-In Ic513ddd99ef32dfc018c2ac9de0671781d6183cd with SHA-1 90f6cf2ef4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/24181976 Change-Id: If6fc619e56f0e60849b8a0ee9089c3c60a205991 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 7322c79a77 -s oursXin Li
am skip reason: Merged-In Ic513ddd99ef32dfc018c2ac9de0671781d6183cd with SHA-1 90f6cf2ef4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/24181976 Change-Id: Ic23a7583cba5b1977c95737597f5e11bbcb88632 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25Merge "libhwc2.1: Add HistogramController class" into udc-qpr-dev am: 3daf07da7fTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/23669445 Change-Id: I2a90ffafebd9d393635c440fd38f86a12bdbc540 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25Merge "libhwc2.1: Add HistogramController class" into udc-qpr-devTreehugger Robot
2023-08-22[automerger skipped] Add chiungfu@ to OWNERS am: cf5c6c54d5 -s oursChiung-fu Chen
am skip reason: Merged-In I3b2cab79035664c64c6ed92852a9e935a728f259 with SHA-1 86d5075626 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/24383829 Change-Id: I0161b0e696721c0e1971977f8b80c0dc08fcd4ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15libhwc2.1: Add HistogramController classLeo Chen
Bug: 255986866 Bug: 227384721 Test: Build pass Change-Id: If7e0690f2baf78c195892f6dbd9e423b7c74ff6f Signed-off-by: Leo Chen <yinchiuan@google.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: Ic513ddd99ef32dfc018c2ac9de0671781d6183cd Change-Id: Iaf8210b7b1acb4527cd5ece91e658d510bc482b2
2023-08-10Add chiungfu@ to OWNERSChiung-fu Chen
Bug: 294345293 Test: none (cherry picked from https://android-review.googlesource.com/q/commit:86d5075626a55d7c98a6b7f254f1d122b38827d1) Merged-In: I3b2cab79035664c64c6ed92852a9e935a728f259 Change-Id: I3b2cab79035664c64c6ed92852a9e935a728f259
2023-08-04Add chiungfu@ to OWNERS am: 86d5075626 am: 55d0643266 am: 2f9e757512 am: ↵Chiung-fu Chen
97c970bf34 Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2692587 Change-Id: I0aa9b24350c980cdf977aa0fb1229e6637c188c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Add chiungfu@ to OWNERS am: 86d5075626 am: 55d0643266 am: 2f9e757512Chiung-fu Chen
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2692587 Change-Id: I8e23fdf88e120464c9d7bf66723880d9771897e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Add chiungfu@ to OWNERS am: 86d5075626 am: 55d0643266Chiung-fu Chen
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2692587 Change-Id: Idb4c0e2885c039a5b22a7654b70a45ed342d9372 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Add chiungfu@ to OWNERS am: 86d5075626Chiung-fu Chen
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2692587 Change-Id: I45be5b9f56c83167303906723b7bfb65262aaac9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Add chiungfu@ to OWNERSChiung-fu Chen
Bug: 294345293 Test: none Change-Id: I3b2cab79035664c64c6ed92852a9e935a728f259
2023-06-28libhwc2.1:libdisplayinterface: remove private::mHistogramInfo am: 310f30b035Oleg Matcovschi
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/23796677 Change-Id: I330f786abb2802bbc4b6d323735e00104c7b6940 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 0b0f55b1cc -s ours am: ↵Xin Li
16377fee61 -s ours am: a6ba6486c8 -s ours am: f84cdba864 -s ours am: 26ab54c27f -s ours am skip reason: Merged-In Ie56845709dae3673ef7bd9b19659e99ad39eb0e8 with SHA-1 83517d3bba is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2634994 Change-Id: I176bf1842684c75cab09848dc04223acd53970b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 0b0f55b1cc -s ours am: ↵Xin Li
16377fee61 -s ours am: a6ba6486c8 -s ours am: f84cdba864 -s ours am skip reason: Merged-In Ie56845709dae3673ef7bd9b19659e99ad39eb0e8 with SHA-1 83517d3bba is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2634994 Change-Id: I504982302dceb3c3517d69fb7facb8996727d34d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 0b0f55b1cc -s ours am: ↵Xin Li
16377fee61 -s ours am: a6ba6486c8 -s ours am skip reason: Merged-In Ie56845709dae3673ef7bd9b19659e99ad39eb0e8 with SHA-1 83517d3bba is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2634994 Change-Id: I253c8b4e84de3f9970addd2a70282b0003b1e41b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26[automerger skipped] Merge Android 13 QPR3 am: 0b0f55b1cc -s ours am: ↵Xin Li
16377fee61 -s ours am skip reason: Merged-In Ie56845709dae3673ef7bd9b19659e99ad39eb0e8 with SHA-1 83517d3bba is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2634994 Change-Id: Ic194c8acfa29b2036fb1c67dea3013f22a509e42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26[automerger skipped] Merge Android 13 QPR3 am: 0b0f55b1cc -s oursXin Li
am skip reason: Merged-In Ie56845709dae3673ef7bd9b19659e99ad39eb0e8 with SHA-1 83517d3bba is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/2634994 Change-Id: I9e3a8ebf746bab0e0e7d3d322dc9445aba16731f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23libhwc2.1:libdisplayinterface: remove private::mHistogramInfoOleg Matcovschi
Re-use protected::mHistogramInfo from base class Bug: 255986866 Change-Id: I7ebee21ae69c2bb76299bb71cc2b3184005d040d Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
2023-06-21Merge Android 13 QPR3Xin Li
Bug: 275386652 Merged-In: Ie56845709dae3673ef7bd9b19659e99ad39eb0e8 Change-Id: I7de4680c43fea1488bf235e0124c524604ff4e39
2023-05-23libhwc2.1: add MALI_GRALLOC_FORMAT_INTERNAL_P010 format am: d205da8eac am: ↵Jeremy Nei
c037e5ab17 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/23358069 Change-Id: I19f79ba0c97122b2dba0e39e5e77a1386cff36be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23libhwc2.1: add MALI_GRALLOC_FORMAT_INTERNAL_P010 format am: d205da8eac am: ↵Jeremy Nei
8eed167a86 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/23358069 Change-Id: I2be538721f7d295400a697e623f5794d5587ade7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23libhwc2.1: add MALI_GRALLOC_FORMAT_INTERNAL_P010 format am: d205da8eacJeremy Nei
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/23358069 Change-Id: Iede12b88b57052ce743ab6acca780b2280531578 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23libhwc2.1: add MALI_GRALLOC_FORMAT_INTERNAL_P010 format am: d205da8eacJeremy Nei
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/23358069 Change-Id: Ief3ddc589a81aa3107d2f740ac1a8c2fcfe763f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22libhwc2.1: add MALI_GRALLOC_FORMAT_INTERNAL_P010 formatJeremy Nei
Bug: 279803577 Test: check video comp type during camera preview with HDR enabled Change-Id: I54e9a86fe36cb4b2933a5e359c7673fe29e775a3
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: ↵Joen Chen
3772e6fed2 am: 90f6cf2ef4 am: 729ab9b5ae Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: I4c4234fd8369a26d870a13990504cadfc0dc36ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: ↵Joen Chen
3772e6fed2 am: 195d09d6a8 am: 411bfd3c61 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: I2e6656e27dad34dd3610130218b55553cf2b0436 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: ↵Joen Chen
3772e6fed2 am: 195d09d6a8 am: 8cd814cefa Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: I4f6725d558806f3c0d38b989c1bd906bcdaa909d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: ↵Joen Chen
3772e6fed2 am: 90f6cf2ef4 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: If782e9ceb43d2d53ea47b86d171bd4107e5c171c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: ↵Joen Chen
3772e6fed2 am: 195d09d6a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: I0bb04c71c66623450730dae315f1dda2d855039e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: ↵Joen Chen
3772e6fed2 am: 195d09d6a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: I8033dd085d8e012e4cd84ea1b5568c602b62d834 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: ↵Joen Chen
3772e6fed2 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: I7e673a3f865226058a5c51a4f97fc7f1e7bd56dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: ↵Joen Chen
3772e6fed2 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: Ic513ddd99ef32dfc018c2ac9de0671781d6183cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-devandroid14-devJoen Chen
2023-05-10libhwc2.1: reserve DPP_VGRFS2 for the outer displayjoenchen
The camera preview is YUV layer and mirrored from inner to outer display, and the outer display’s orientation is different with the inner display. Therefore, HWC reserves the DPP_VGRFS2 for the outer display. Bug: 267449852 Test: use the camera apk + dual concurrent display Change-Id: Id477e73e811fd9cc6b15602691797537cabf3d7e
2023-05-02Merge "libhwc2.1: move ppc_table_map under soc namespace" into udc-d1-dev ↵Wiwit Rifa'i
am: 3c62d65e17 am: 6deb9ab0a5 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/22180704 Change-Id: I917fab2a037ed327d1f22fecc86e69d0e97e63e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02Merge "libhwc2.1: move ppc_table_map under soc namespace" into udc-d1-dev ↵Wiwit Rifa'i
am: 3c62d65e17 am: baf9f9b4bc Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/22180704 Change-Id: Id4021043331a086de425b376db92df918e0a5530 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02Merge "libhwc2.1: move ppc_table_map under soc namespace" into udc-d1-dev ↵Wiwit Rifa'i
am: 3c62d65e17 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/22180704 Change-Id: I0e9c77cfdc846c1e47e2c814971821039de288b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02Merge "libhwc2.1: move ppc_table_map under soc namespace" into udc-d1-dev ↵Wiwit Rifa'i
am: 3c62d65e17 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/22180704 Change-Id: Ic0500da830565c86f1dad9bbd65acb34fe88445a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02Merge "libhwc2.1: move ppc_table_map under soc namespace" into udc-d1-devWiwit Rifa'i