diff options
| author | 2024-04-03 20:39:21 +0000 | |
|---|---|---|
| committer | 2024-04-03 20:39:21 +0000 | |
| commit | 680aebab76d211c3d5210bad716feee438731219 (patch) | |
| tree | d811584c1775c354559cb2ee9e740d1820a0ea9b /libs/androidfw/StringPool.cpp | |
| parent | 5133a8f342a169055735c8b172566feaf9218be7 (diff) | |
| parent | deafb2d4f2db7ac0ba470a84d70c274a1937ed00 (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: 4908550159 -s ours am: deafb2d4f2 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072
Change-Id: Ie5e0fe14c35a4651b6608991a39e8b26365a51c9
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