| commit | 9630ba97704cabcb9a9ca3809354188f428102f6 | [log] [tgz] |
|---|---|---|
| author | Guojing Yuan <guojing@google.com> | Wed Apr 03 20:39:37 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 03 20:39:37 2024 +0000 |
| tree | 0364286d54fcc6c19a600b276a363f89fb187e78 | |
| parent | 0e941d37212480f749626abe424ecea060ecb8e4 [diff] | |
| parent | 1694173e5b180ae3fb98a18f5991bb782e7e64bb [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: 5da632b1af -s ours am: 1694173e5b -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: I232606abd391e38223d134fd329bc6af92d6923e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>