summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-02-10Merge cherrypicks of ['googleplex-android-review.googlesource.com/21354853'] ↵android-13.0.0_r55android13-d2-releaseAndroid Build Coastguard Worker
into tm-d2-release. Change-Id: Iee6d73c93cf23fd0b1be8bf2743db75a383100df
2023-02-10Remove feature controlsFabian Kozynski
Bug: 268204890 Test: many manual tests, including upgrade path from this build to "QPR3" Change-Id: Id830e5738d791df02df492135fa5791268002d59 (cherry picked from commit ee039df44c0bfa2711bb9e94fbb5ec3892958843) Merged-In: Id830e5738d791df02df492135fa5791268002d59
2023-02-09Merge cherrypicks of ['googleplex-android-review.googlesource.com/21075295'] ↵Android Build Coastguard Worker
into tm-d2-release. Change-Id: I453e150ea16a9d0df1e8753c084fd897684c5dca
2023-02-09SF: fix FrameTimelineInfo association to buffersAdy Abraham
Store a mapping between a frame number and the FrameTimelineInfo and apply the correct FrameTimelineInfo on the transaction. Test: TBD Bug: 255875655 Change-Id: I4206984be8e5a91c5dc15b74688575d97fbb5357 Merged-In: I4206984be8e5a91c5dc15b74688575d97fbb5357 (cherry picked from commit c9abfdcb963512177fd1ac0f95d43be80d4135af) Merged-In: I4206984be8e5a91c5dc15b74688575d97fbb5357
2023-01-26Snap for 9527334 from 47b10431f9a86df285939ae4e3607fc561f1a005 to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: Id3162d7dd77fd21742c33b7e2bb5cc67cd3b544a
2023-01-25[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 03d4458ea0 am: eecb9da535 -s ours am: 353274b15c -s ours am: c907314332 -s ours am: fd8f137133 -s ours am: 578dfd98c9 -s ours am: 513724f090 -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 3ea58dbc1d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20892111 Change-Id: I8bb38e8d1ce047deb4db1376935d7ef77bd9347a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 03d4458ea0 am: eecb9da535 -s ours am: 353274b15c -s ours am: c907314332 -s ours am: fd8f137133 -s ours am: 578dfd98c9 -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 3ea58dbc1d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20892111 Change-Id: If53b1c2f1be0e6500753ed53aab0de67b6010ae2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 03d4458ea0 am: eecb9da535 -s ours am: 353274b15c -s ours am: c907314332 -s ours am: fd8f137133 -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 3ea58dbc1d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20892111 Change-Id: I82133b30573da24b5eaa2abe1556f76c3c7b1072 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 03d4458ea0 am: eecb9da535 -s ours am: 353274b15c -s ours am: c907314332 -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 3ea58dbc1d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20892111 Change-Id: I1ca0bb50840c1089ce57b795f617f9d1d5a76e65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 03d4458ea0 am: eecb9da535 -s ours am: 353274b15c -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 3ea58dbc1d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20892111 Change-Id: I5e30a4de337cf16ccb664f760f8772088c06f662 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 03d4458ea0 am: eecb9da535 -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 3ea58dbc1d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20892111 Change-Id: I71386888373c6f49527569440366d2f97f00f47a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Mitigate the security vulnerability by sanitizing the transaction flags. am: ↵Sally Qi
03d4458ea0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20892111 Change-Id: Id8c63fb401b3642ec7c3d765171a093bbebacdb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Snap for 9523264 from ac7450664f76b0ecbfa83aede905491cad1ea1e2 to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: Icbeb1c8663842ec4a971ba7aff96174221ea7f17
2023-01-24[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 3ea58dbc1d am: 8b172cefcb am: e3ae4f39f6 -s ours am: 96742baf3a -s ours am: b982e21dba -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 5d1b23522b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20886664 Change-Id: Ic7920ef2ac26974f6ea791bc7f8a374bb852c06c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 3ea58dbc1d am: 8b172cefcb am: e3ae4f39f6 -s ours am: 96742baf3a -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 5d1b23522b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20886664 Change-Id: I08e75fdb938e320a94bfed2df2c7c345ae560778 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24[automerger skipped] Mitigate the security vulnerability by sanitizing the ↵Sally Qi
transaction flags. am: 3ea58dbc1d am: 8b172cefcb am: e3ae4f39f6 -s ours am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 5d1b23522b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20886664 Change-Id: I0b5a2d472568c1c821a1346903f3bbcbab7a24e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Mitigate the security vulnerability by sanitizing the transaction flags. am: ↵Sally Qi
3ea58dbc1d am: 8b172cefcb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20886664 Change-Id: I3831739ed5fe30094f64400fc38e9c8a18cf7807 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Snap for 9519047 from d684366459f9916a0c1b5ff2774f2912174b0277 to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: I04316303171a41fd3283a6696f849a41ae899f50
2023-01-23Mitigate the security vulnerability by sanitizing the transaction flags. am: ↵Sally Qi
3ea58dbc1d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20886664 Change-Id: Ib704fa0d4a35234e247eb6cc1f596defb4d7d23f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23Merge "Mitigate the security vulnerability by sanitizing the transaction ↵Sally Qi
flags." into tm-dev am: 52a0d7cbb6 am: 0776ea95b6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20681289 Change-Id: I1f2be7a9c911ebd3952543a93e02275c62005af8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23Merge "Mitigate the security vulnerability by sanitizing the transaction ↵Sally Qi
flags." into tm-dev am: 52a0d7cbb6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20681289 Change-Id: Ic37dab4412f437a427dcf6079c50928bf9a37deb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23Merge "Mitigate the security vulnerability by sanitizing the transaction ↵Sally Qi
flags." into tm-dev
2023-01-23Mitigate the security vulnerability by sanitizing the transaction flags.Sally Qi
- This is part of fix of commit Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df for backporting. - Part of commit Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df which sanitizes the transaction flags from DisplayState instead. - In rvc, we only have ACCESS_SURFACE_FLINGER permission check passed as `privileged` argument in SF::applyTransactionState. We can directly utilize it for sanitization in DiaplyState. - In rvc code base, SF::setTransactionState pass a const array of displayState objects and then call SF::applyTransactionState. To successfully sanitize the flags for each displayState object, we convert this const array into non-const one before calling SF::applyTransactionState. Bug: 248031255 Test: test using displaytoken app manually on the phone, test shell screenrecord during using displaytoken; atest android.hardware.camera2.cts.FastBasicsTest Change-Id: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df Merged-In: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df
2023-01-23Merge "DO NOT MERGE Revert "Revert "Clean up ↵Mariia Sandrikova
debug.sf.ignore_hwc_physical_display_or..."" into tm-qpr-dev
2023-01-23DO NOT MERGE Revert "Revert "Clean up ↵Mariia Sandrikova
debug.sf.ignore_hwc_physical_display_or..." Clean up debug.sf.ignore_hwc_physical_display_orientation Temporary property was introduced in Iffbdc13149f517f0b59b313f1fe1f7900cc8597e Test: manual Bug: 246793311 Revert submission 20920163-revert-20881991-clean-up-temp-sysprop-FZOZHLNEBL Reason for revert: Revert a revert of I000feb9e54a9f3b897eb4867fb285788cdb2fc46 to land it again Reverted changes: /q/submissionid:20920163-revert-20881991-clean-up-temp-sysprop-FZOZHLNEBL Change-Id: I1ac24f72b7bbdf1e82a7c840e800faed13aa2c1e
2023-01-19Snap for 9504598 from ca9671d55f7c754434b8381b54cb2d9567562867 to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: Id4f8b817c30eb7f4d5ef7d5992c36f38905f60b5
2023-01-18Merge "Allow to apply first brightness as -1" into tm-qpr-devTreeHugger Robot
2023-01-17Snap for 9495226 from 5027343b878094168971a5526d0fb820b6c8710a to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: I8a5745b69dfd88c5a3bc4a818731c55ac59ce332
2023-01-16[automerger skipped] Snap tm-dev to android13-tests-dev am: 9750ee219c -s ↵Samip Garg
ours am: 3dfc8488a7 -s ours am skip reason: Merged-In Id23fa2f0004319f4ee592e19dc34a6b74cdb644f with SHA-1 c621d8d2be is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20514328 Change-Id: Idc82895d9c408f5d7012333fb77e7c39972d7743 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12Allow to apply first brightness as -1linpeter
The initial brightness is -1 in DisplayDevice. It won't apply the brightness(-1) for the first brightness. This allow an caller to set the brightness to -1 Bug: 254657816 test: atest libsurfaceflinger_unittest:SetDisplayBrightnessTest Change-Id: I3a87d0b505b8bf8ce411c86a061376aadba42a88 Merged-In: I3a87d0b505b8bf8ce411c86a061376aadba42a88
2023-01-11[automerger skipped] Snap tm-dev to android13-tests-dev am: 9750ee219c -s oursSamip Garg
am skip reason: Merged-In Id23fa2f0004319f4ee592e19dc34a6b74cdb644f with SHA-1 c621d8d2be is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20514328 Change-Id: Ic0ff019bea7233aad39a498586fc614b541cf164 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Snap for 9474727 from b567cd17371d4c66ea124642429b1d1d9f9231a6 to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: I379bafe1fef001c61935cb91ef73cf7d115c1024
2023-01-10Merge "[BBQ] Only wait when acquiring a buffer if in a sync." into tm-qpr-devChavi Weingarten
2023-01-10Merge "Fix wallpaper window multi-touch" into tm-qpr-devTreeHugger Robot
2023-01-10Merge "Revert "Clean up debug.sf.ignore_hwc_physical_display_orientation"" ↵Neha Jain
into tm-qpr-dev
2023-01-09Revert "Clean up debug.sf.ignore_hwc_physical_display_orientation"Neha Jain
Revert submission 20881991-clean-up-temp-sysprop Reason for revert: b/264735287 Reverted changes: /q/submissionid:20881991-clean-up-temp-sysprop Change-Id: I26b51519ef8b7f15a56577fe44e5ed6bba2e75e7
2023-01-09[BBQ] Only wait when acquiring a buffer if in a sync.Chavi Weingarten
There's no need to do the explicit maxBuffersAcquired check since the acquireBuffer call will return a status of NO_BUFFER_AVAILABLE if it can't acquire any more buffers. Therefore, the code can be simplified so it will return early in most cases if NO_BUFFER_AVAILABLE is returned. If there was a request to sync the buffer, then we need to wait on a free buffer and not return early. Test: BBQ syncs Bug: 263340543 Bug: 263570429 Change-Id: I11a81a440bc0d22ba85bcf4d4a068b853ca5cf9c Merged-In: I11a81a440bc0d22ba85bcf4d4a068b853ca5cf9c
2023-01-07Snap for 9463735 from 0130e8f33718eae2a486352bf733e3ccbde3d4a6 to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: Ia58240da753cc9a36c64255db5ac9701d9c9b919
2023-01-06Merge "Clean up debug.sf.ignore_hwc_physical_display_orientation" into ↵Mariia Sandrikova
tm-qpr-dev
2023-01-06Merge "DO NOT MERGE: Revert "Check display id of the last hover window ↵Prabir Pradhan
before it is cleared"" into tm-qpr-dev
2023-01-05Mitigate the security vulnerability by sanitizing the transaction flags.Sally Qi
- This is part of fix of commit Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df for backporting. Bug: 248031255 Test: test using displaytoken app manually on the phone, test shell screenrecord during using displaytoken; atest android.hardware.camera2.cts.FastBasicsTest Change-Id: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df Merged-In: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df
2023-01-06Mitigate the security vulnerability by sanitizing the transaction flags.Sally Qi
- This is part of fix of commit Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df for backporting. Bug: 248031255 Test: test using displaytoken app manually on the phone, test shell screenrecord during using displaytoken; atest android.hardware.camera2.cts.FastBasicsTest Change-Id: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df Merged-In: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df
2023-01-06Clean up debug.sf.ignore_hwc_physical_display_orientationMariia Sandrikova
Temporary property was introduced in Ie0a9859a43948b97414c97db279ff4d32bce3ac1 Test: manual Fix: 246793311 Change-Id: Ic7e102201196285cba18e12e27c7cd4d40dcc8e4
2023-01-05DO NOT MERGE: Revert "Check display id of the last hover window before it is ↵Prabir Pradhan
cleared" This reverts commit ff0c66e855925476c5ce06ad133f9084e725f96a. Reason for revert: b/263272128 This platform change causes a regression in CTS tests. Since the CTS test fix will only be released in the next quarterly release, we must wait for the test to be released before landing this fix. Change-Id: If2db80acb83f6731f66b49f8827f428a85e27370
2022-12-23Fix wallpaper window multi-touchArthur Hung
If the touched window has a wallpaper, then the touch event will be duplicated to the wallpaper window when the foreground window received a touch event. When the foreground supports split touch, the wallpaper should deliver the same events of foreground window. And when the foreground window is transferred (caused by slippery or transfer touch) to the new touched window, it has to check if the wallpaper window should deliver the cancel event or keep in current touch state. Bug: 240308355 Test: atest inputflinger_tests Change-Id: Ie53279f18838c459e528b24709aebf739290dc41 (cherry picked from commit c539dbb9812e30632ca2946ef6b1150127db0182) Merged-In: Ie53279f18838c459e528b24709aebf739290dc41
2022-12-22Snap for 9428515 from 3dd864dd14c84df4a012e9513ac56089ab093b38 to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: Ic9aee1d19802c65b3a92162bf12946b10deea923
2022-12-21Merge "[6/n][Pro] Change natural device orientation to portrait." into ↵Mariia Sandrikova
tm-qpr-dev
2022-12-21Snap for 9424627 from ff0c66e855925476c5ce06ad133f9084e725f96a to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: I0392d18cc4c079e03031e949feaa29dac82ada59
2022-12-16Snap for 9410359 from 76742845662a10dcd7e9a7dbcfcd8b1b2999ce4f to tm-d2-releaseAndroid Build Coastguard Worker
Change-Id: Id1562bbeece2e4cb55d7f5352441e79dfd13decb
2022-12-15Check display id of the last hover window before it is clearedTommy Nordgren
The display id of the last hover window must be checked before it is cleared when a window changes for a display. If display id of the last hover window is not checked, then the last hover window is cleared every time a window changes on a different display which is faulty. The last hover window should only be cleared when the window is removed from the same display as the display of last hover window. Add test that ensure that only one hover enter is generated followed by several hover move when the mouse is moved in a window on primary display when windows on second display are removed. The CTS test, VirtualMouseTest, must also be updated. Reference patch: Correct CTS test VirtualMouseTest#sendRelativeEvent Ie4a54ee3469ed0b7c88abea946f32f66203da38f Bug: 239687726 Bug: 262701886 Test: atest VirtualMouseTest Change-Id: I70ebcb994ebc31327b85303110753ce3d40329be Merged-In: I70ebcb994ebc31327b85303110753ce3d40329be (cherry picked from commit dae9dfcf89fb79cdf27353d7f4220a36f83b343d)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 18:07:04 +0000