| commit | c5acbe324508f34c65bdabcda2ae620330695153 | [log] [tgz] |
|---|---|---|
| author | Guojing Yuan <guojing@google.com> | Wed Apr 03 20:57:29 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 03 20:57:29 2024 +0000 |
| tree | 21c7254af399b8764f2df56d8295dc219ba780a9 | |
| parent | 4575c657f451a21fe7ec0506b5f1a666a6a1a0b1 [diff] | |
| parent | 680aebab76d211c3d5210bad716feee438731219 [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: I774e60c6a4e57633ca7a20d5e3b8d012900d25aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>