| commit | 49085501594e93c8b0591553f80d1f6ab4607007 | [log] [tgz] |
|---|---|---|
| author | Guojing Yuan <guojing@google.com> | Wed Apr 03 19:37:24 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 03 19:37:24 2024 +0000 |
| tree | c436a81582770cf3e3ba9633f0529899f30cb616 | |
| parent | 123ee9828975b0232dfe48c96bf30ccbdce9f135 [diff] | |
| parent | d8ee4d8b7159c241c2e8d330a155b8b171bffadc [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: I7cffb7a321051bc5f456eabb65e23f758af68375 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>