| commit | 195f9704e0a2a8ce5f0df31a317edb8ebee15ab0 | [log] [tgz] |
|---|---|---|
| author | Guojing Yuan <guojing@google.com> | Wed Apr 03 20:47:11 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 03 20:47:11 2024 +0000 |
| tree | d811584c1775c354559cb2ee9e740d1820a0ea9b | |
| parent | 1e1c589e58ab3625e86fc9699e0237c63c6fe3a6 [diff] | |
| parent | 9630ba97704cabcb9a9ca3809354188f428102f6 [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: 9630ba9770 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: I4fdaed018f685ae3559033e3cdfc960c0acdcda3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>