Commit Graph

751427 Commits

Author SHA1 Message Date
Presubmit Automerger Backend
f207c2fb97 [automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 08d1494421 am: 1632d59830 -s ours am: cf4e9e137f -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0d304b027f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16678490

Change-Id: I8d066e947a8e9ed9699f3e65237327bf22863147
2022-03-07 12:08:12 +00:00
John Wu
25ff0bd84d Merge "Update PackageInfo APIs to reflect shared UID status" into tm-dev am: a8196fc56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17050883

Change-Id: I969bf7c378ce8ae204334da3b5409c41c55374b9
2022-03-07 12:08:00 +00:00
Issei Suzuki
67e27bcb54 Merge "Apply right animation type on translucent window containers." into tm-dev am: 4a785a1407
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002646

Change-Id: I90dbcfb3be38120428a3450bd3d6cb209c148ac8
2022-03-07 12:07:33 +00:00
John Wu
285bdf3e71 Merge "Introduce "Best Effort" shared UID migration strategy" into tm-dev am: b7a5292407
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982773

Change-Id: I90c75ca3efeb4f84a0d0e3ac5da665bb6870219c
2022-03-07 12:06:55 +00:00
Presubmit Automerger Backend
cf4e9e137f [automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 08d1494421 am: 1632d59830 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0d304b027f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16678490

Change-Id: I8856f989c6909f806d739a83f4ac2cd6a9d0cc6a
2022-03-07 12:06:45 +00:00
John Wu
a8196fc56c Merge "Update PackageInfo APIs to reflect shared UID status" into tm-dev 2022-03-07 11:47:05 +00:00
Issei Suzuki
4a785a1407 Merge "Apply right animation type on translucent window containers." into tm-dev 2022-03-07 11:46:47 +00:00
John Wu
b7a5292407 Merge "Introduce "Best Effort" shared UID migration strategy" into tm-dev 2022-03-07 11:46:14 +00:00
TreeHugger Robot
57a3234cdd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours am: 44d3952d8f -s ours am: fdefecb795 -s ours am: df676d36fe -s ours am: 0bd62a7ee1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Idcba3950a8c05416abe08c76a9a21ff9811ae1c0
2022-03-07 11:24:01 +00:00
Jeff Chang
5ebe487806 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours am: 5c5b837442 -s ours am: 8baf19724e -s ours am: a14f29c5fd -s ours am: 89fc70c59f -s ours am: 981271f90d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Ie58a7dccc4367c0e9157743ae7174d8455a4ff30
2022-03-07 11:23:59 +00:00
TreeHugger Robot
109193a698 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours am: eaae32a449 -s ours am: e64e5d8cb2 -s ours am: 747ee9bd41 -s ours am: 436fb542f3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Ib77c2423880c09565e7be80b8124caa67e41b724
2022-03-07 11:23:43 +00:00
Jeff Chang
3b3fbbedda [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours am: 506c82612a -s ours am: 937421747a -s ours am: 11583e249b -s ours am: 7f6475ab5b -s ours am: 5fda46f662 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Ib75bb18057e828da031de4663eb1d0e80d5788b0
2022-03-07 11:23:42 +00:00
TreeHugger Robot
0bd62a7ee1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours am: 44d3952d8f -s ours am: fdefecb795 -s ours am: df676d36fe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I0c94332af476afb6bb4b379381daccbf6bd34bd0
2022-03-07 11:17:15 +00:00
Jeff Chang
981271f90d [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours am: 5c5b837442 -s ours am: 8baf19724e -s ours am: a14f29c5fd -s ours am: 89fc70c59f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I27f2de4ee5adf1de481d34ba8f7fbd51eb53a5c2
2022-03-07 11:15:37 +00:00
TreeHugger Robot
436fb542f3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours am: eaae32a449 -s ours am: e64e5d8cb2 -s ours am: 747ee9bd41 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I21f7e6aa0fa8bd5b5914ea0bc1e52cc333dfd5a6
2022-03-07 11:13:58 +00:00
Jeff Chang
5fda46f662 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours am: 506c82612a -s ours am: 937421747a -s ours am: 11583e249b -s ours am: 7f6475ab5b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I41781ff9ca4f230fad9e1c8e59cb7786c43de81e
2022-03-07 11:13:31 +00:00
Simon Bowden
baaf4942d9 Merge "Ensure unlinkToDeath when cancelling external vibrations." into tm-dev am: 4dfe4924d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071468

Change-Id: I0dd8ed96150d6d5a5eebf3cf777a951fcd07f22a
2022-03-07 11:01:26 +00:00
Simon Bowden
4dfe4924d4 Merge "Ensure unlinkToDeath when cancelling external vibrations." into tm-dev 2022-03-07 10:57:22 +00:00
TreeHugger Robot
bb96144a49 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours am: 3e6bf61403 -s ours am: 429c7328bc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I2ba03fbf2ec06e5e00002d597236f1b82882f502
2022-03-07 10:51:56 +00:00
Jeff Chang
9d5b717fc2 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours am: 5c5b837442 -s ours am: 220b723cb0 -s ours am: 73d2bc87d8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Ie41f67013ef5986eae68e193722dd11ae12bd907
2022-03-07 10:51:53 +00:00
TreeHugger Robot
df676d36fe [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours am: 44d3952d8f -s ours am: fdefecb795 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Ib6caec5daf04533de45e0359bf780321a565d7ce
2022-03-07 10:51:40 +00:00
TreeHugger Robot
a25ed3cb6b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours am: 8af78977d7 -s ours am: f83059b826 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I364255f3efa20dd3154afbd452691cc8b6410a96
2022-03-07 10:51:33 +00:00
Jeff Chang
31e1b86eb9 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours am: 506c82612a -s ours am: 587f088434 -s ours am: c37fbf4af7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I15755405a109bcef4afda270c55eb95011617936
2022-03-07 10:51:32 +00:00
Jeff Chang
89fc70c59f [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours am: 5c5b837442 -s ours am: 8baf19724e -s ours am: a14f29c5fd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I1e2b02b04bc2e5891bb515c04332d635cb55a75d
2022-03-07 10:51:26 +00:00
TreeHugger Robot
747ee9bd41 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours am: eaae32a449 -s ours am: e64e5d8cb2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I15433bc349bc22ebe02b12bdeb6a6a701dbd507f
2022-03-07 10:50:55 +00:00
Jeff Chang
7f6475ab5b [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours am: 506c82612a -s ours am: 937421747a -s ours am: 11583e249b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I65d9ea0eb077b1d5e7b379616a5f07804cee1f71
2022-03-07 10:50:28 +00:00
TreeHugger Robot
429c7328bc [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours am: 3e6bf61403 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I8a31af94077f61eb7d431ffa3b65af9fddc91320
2022-03-07 10:32:17 +00:00
Jeff Chang
73d2bc87d8 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours am: 5c5b837442 -s ours am: 220b723cb0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Iad0c0336bc23a4de36acce650bda5bee375bd0ff
2022-03-07 10:32:07 +00:00
TreeHugger Robot
f83059b826 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours am: 8af78977d7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Iefa1db741e68f5e1997ff47666283db7f1e41eb3
2022-03-07 10:31:32 +00:00
TreeHugger Robot
fdefecb795 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours am: 44d3952d8f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Ibe631082ebfbafed204d5cef904f7a5426142410
2022-03-07 10:31:28 +00:00
Jeff Chang
a14f29c5fd [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours am: 5c5b837442 -s ours am: 8baf19724e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I03d8505a3434a5f152b57a55a7047f8bbdc2bfbb
2022-03-07 10:31:17 +00:00
TreeHugger Robot
e64e5d8cb2 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours am: eaae32a449 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Ib4a7a6c716391ae1c32520477ab6a035e2916ad4
2022-03-07 10:30:59 +00:00
Jeff Chang
c37fbf4af7 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours am: 506c82612a -s ours am: 587f088434 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Ia7f980bad17c4157ca0be951b0c017d3a30f6d40
2022-03-07 10:30:56 +00:00
Jeff Chang
11583e249b [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours am: 506c82612a -s ours am: 937421747a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Ibafd0e90f20f055237de9051fc2b2f13018db634
2022-03-07 10:30:50 +00:00
TreeHugger Robot
44d3952d8f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Icaf2a2050d4bfa9e1d43d51dc3da886e884496fa
2022-03-07 10:09:33 +00:00
Jeff Chang
8baf19724e [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours am: 5c5b837442 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I7a3f96973ca94c7fc30259626f2430dca2542749
2022-03-07 10:09:32 +00:00
TreeHugger Robot
eaae32a449 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Ic6b04dfcd41426a9237a41d773c7a156490028aa
2022-03-07 10:09:17 +00:00
Jeff Chang
937421747a [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours am: 506c82612a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: If8e9f962b417d8c8d4ad8ee1da16d64cecb944a1
2022-03-07 10:09:10 +00:00
TreeHugger Robot
3e6bf61403 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours am: fb7b70bdb4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Idc9446ef8ca81a43dd001322b813bc95b0bedfc9
2022-03-07 10:08:36 +00:00
Jeff Chang
220b723cb0 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours am: 5c5b837442 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I3444df6e05d7284b537c89e46ed82e754ace40bc
2022-03-07 10:08:33 +00:00
TreeHugger Robot
8af78977d7 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Ief8a5b102ee7336e661331805785210de79366f3
2022-03-07 10:08:19 +00:00
Jeff Chang
587f088434 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours am: 506c82612a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I1cea8d9350270918c57bd1c7d6fa0aa6ef99f0d4
2022-03-07 10:08:08 +00:00
TreeHugger Robot
fb7b70bdb4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: Id84deef83bd9641d9a366ed7fff49c545fc1b53e
2022-03-07 09:46:25 +00:00
Jeff Chang
5c5b837442 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I4a7362dff152e108c8d9f31b09e45525e45d96a4
2022-03-07 09:46:09 +00:00
TreeHugger Robot
748ed4c7cb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I250a4502e845b7219e0f33d7db24a95dda86ec00
2022-03-07 09:45:37 +00:00
Jeff Chang
506c82612a [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I4eaba4ff7bd41d4c879d686892bc1fd76902f0a0
2022-03-07 09:45:17 +00:00
TreeHugger Robot
f36ed930cd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I50789965770642edef8730349b6e386b9587963c
2022-03-07 09:25:46 +00:00
Jeff Chang
92e566d24f [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I3e41f8de655e5de2beae89e08a58cb27c0039358
2022-03-07 09:25:36 +00:00
TreeHugger Robot
711b63a3ea Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I7f86a6587b14f63d8e4c472de9e2d38f1892084e
2022-03-07 09:25:16 +00:00
Jeff Chang
fc2e453887 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours
am skip reason: skipped by user chengjeff

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: I33edd649c842c5070e030861adb0128aa5fddc48
2022-03-07 09:25:01 +00:00