commit | 9ba854115b87b49ad4c1297d2a5b125f836cd6aa | [log] [tgz] |
---|---|---|
author | Guojing Yuan <guojing@google.com> | Wed Apr 03 21:10:31 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 03 21:10:31 2024 +0000 |
tree | 43f8ecf61ecefb1826f7d330ccca981febb562b9 | |
parent | 735c44b740e8c75668568bb81264c78eeed1bd1c [diff] | |
parent | c5acbe324508f34c65bdabcda2ae620330695153 [diff] |
[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb72 am: 14359bbd1f -s ours am: ca1ed38f14 -s ours am: d8ee4d8b71 -s ours am: 4908550159 -s ours am: deafb2d4f2 -s ours am: 680aebab76 -s ours am: c5acbe3245 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: I30aec9000da7683d5aa9feea8f40c86716f21e77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>