tree f0cb168bc88e65a71ff763ae87752c3512c38d16
parent 56c8619240c9b248bc047f386a0a432ba8e53fbe
parent 11b0ff5a0ff713c90cc5e09d3c44da26b1dc1b58
author Guojing Yuan <guojing@google.com> 1712171965 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712171965 +0000

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecfa5 am: a265dfa777 -s ours am: 11b0ff5a0f -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072

Change-Id: I898ac1fa64af4b01eb1dcbe3dc9b5e20e2492f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>