diff options
| author | 2023-11-22 00:22:24 +0000 | |
|---|---|---|
| committer | 2023-11-22 00:22:24 +0000 | |
| commit | c4a79b2701c34dd5ab1d341a5d01cc8214f771c1 (patch) | |
| tree | 2d73ed736bd6848747a18ba4bac571b2d09aab83 /libs/androidfw/FileStream.cpp | |
| parent | 7d4d901baf9f0392bbe408fb7a5e1dba6d61619c (diff) | |
| parent | 353d3c6219d0d60334922e59e5ea9b1f1c4cfd77 (diff) | |
[automerger skipped] Merge "Restrict activity launch when caller is running in the background" into rvc-dev am: dce6a262f7 am: f3e0e019b6 -s ours am: 44cf76a444 -s ours am: a43fce1d35 -s ours am: e8d5e56e47 -s ours am: 192afbf336 -s ours am: ae515c253c -s ours am: 3b75f4965f -s ours am: f470bb0bf3 -s ours am: 1f6e0e420a -s ours am: 2130fab584 -s ours am: 353d3c6219 -s ours
am skip reason: Merged-In I1a0c13e74622d301866efaca1b5351a6b241ebe5 with SHA-1 d54a64bdf7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23262449
Change-Id: If996e3d883b8a5d807f77323a9e5821bcecae1c2
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