summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Guojing Yuan <guojing@google.com> 2024-04-03 20:25:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-03 20:25:14 +0000
commitdeafb2d4f2db7ac0ba470a84d70c274a1937ed00 (patch)
tree0364286d54fcc6c19a600b276a363f89fb187e78 /libs/androidfw/ZipFileRO.cpp
parent6060da3771cb064ab25395413fd2b356c4a698de (diff)
parent49085501594e93c8b0591553f80d1f6ab4607007 (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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26666072 Change-Id: Id6b9bf4d722ac9a28983792f33ac882f63c50bc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions