summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-08-01 21:45:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-01 21:45:34 +0000
commit18e1acf94038835b9e42eae5b94646da9b41583d (patch)
tree9ddb4262cdf330e6ca0bb3df7e0ae3ae2afec366 /libs/androidfw/FileStream.cpp
parentac8e46d9970d550ba277e3d5e42086b31f38d840 (diff)
parent3fde2a8fa3597f77e61d40063bffbf0cc1e4b7ca (diff)
[automerger skipped] Add userId check before loading icon in Device Controls am: 2be24a7804 -s ours am: c1b0b217a9 -s ours am: 78f6c79a1b -s ours am: 029e25a34b -s ours am: 79421b7608 -s ours am: 86b6b9b8ce -s ours am: 14603cf4a3 -s ours am: 3fde2a8fa3 -s ours
am skip reason: Merged-In Ib0e677f7ccbed6299ea07939519c7dcf6d371bec with SHA-1 22f97f081c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23981526 Change-Id: Ibcd3bb95ca5c02d4dad3869e6094e1a2e209e385 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions