commit | ea2ed778452779e55eaff4610571b89c25de6980 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 07 21:42:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 07 21:42:38 2021 +0000 |
tree | b90d49a3ff2d804650a961e7221e6389cff23d24 | |
parent | 4d25380ce2b3fb5ffbe422e23c19ad387ec87ce9 [diff] | |
parent | afb4c5f2440ab0d4a50d1e3ac15d06124f8bcc7e [diff] |
[automerger skipped] Merge "Ensure to switch to unprotected context if display is not secure." am: 048f1e93fd am: 4fafd3a9c2 -s ours am: afb4c5f244 -s ours am skip reason: Change-Id Ieeda99a92e8d78f7418f7a1e0da9938bcd4753d5 with SHA-1 4d0996faee is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1533792 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I716c3ab6f719ce3e173a1960b9a23cb50222156c