diff options
| author | 2024-04-03 20:58:18 +0000 | |
|---|---|---|
| committer | 2024-04-03 20:58:18 +0000 | |
| commit | 96305a564c3f535918924d2364b86d04e05a0ad4 (patch) | |
| tree | 63374ab788081a8b872538d80b9e2f9c154962bc /libs/androidfw/StringPool.cpp | |
| parent | 603bc5b4eff80938fdc3a5e569ded6f69ee82a6a (diff) | |
| parent | eeea4d99cac7af032b37e00e58b47c52197c7b9e (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: eeea4d99ca -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072
Change-Id: Ia670fe450e654ab678ccf61338f0150d11a25d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions