commit | c710617ac6489a7f518c5138a78059a99f98e38d | [log] [tgz] |
---|---|---|
author | Sally Qi <sallyqi@google.com> | Wed Oct 05 11:42:30 2022 -0700 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Feb 14 18:17:40 2023 +0000 |
tree | 8de221b17b61366d1d8ce36612a9b44b7250f7a6 | |
parent | d1735f8e6ff1737e6aa93e3d92f2b5852e523fd6 [diff] [blame] |
Mitigate the security vulnerability by sanitizing the transaction flags. - 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 (cherry picked from commit 5d1b23522b6a164c43375bd11e3369b4c1f49ac5) Merged-In: Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df
diff --git a/services/surfaceflinger/tests/DisplayConfigs_test.cpp b/services/surfaceflinger/tests/DisplayConfigs_test.cpp index 2dc96b8..c58fe48 100644 --- a/services/surfaceflinger/tests/DisplayConfigs_test.cpp +++ b/services/surfaceflinger/tests/DisplayConfigs_test.cpp
@@ -149,4 +149,4 @@ } // namespace android // TODO(b/129481165): remove the #pragma below and fix conversion issues -#pragma clang diagnostic pop // ignored "-Wextra" \ No newline at end of file +#pragma clang diagnostic pop // ignored "-Wextra"