Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,190 Commits 3 Branches 0 Tags
90e7b4cc40a51bad7d26809fc4c0662e5a129ec7
Commit Graph

661190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate Myren
90e7b4cc40 RESTRICT AUTOMERGE Validate permission tree size on permission update 
Bug: 242537498
Test: manual
Change-Id: I15343e84c1802d6b89249106263319a6539fa73b
 2022-10-19 21:16:41 +00:00
Matt Pietal
ec6bffc879 [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours am: e32da18b5e -s ours am: 0b21b97d57 -s ours am: f42de9e535 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69ca66cf004f97b06e91c3ab768fd4b8d90a1a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 16:09:40 +00:00
Matt Pietal
bc66d3802b [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours am: 0d3f936b8b -s ours am: 5387568458 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25314284832f9f661b0a11726bd358198efcabcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 16:09:31 +00:00
TreeHugger Robot
5e2b9a43ca Merge "Prevent exfiltration of system files via avatar picker." into sc-dev am: 43e0f944cb am: f76ea6006a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748987

Change-Id: I1b6518355105946b55ae7c6255ec89f80585bc50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 16:09:23 +00:00
TreeHugger Robot
969e9cf845 Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev am: a30bf19d1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748987

Change-Id: I5f72738e075f3a463b2a6e2835e6a64eb22026b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 16:08:56 +00:00
Matt Pietal
f42de9e535 [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours am: e32da18b5e -s ours am: 0b21b97d57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7857f3cb85e99a3a579e14698a50602ae9e3d50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 16:06:27 +00:00
Matt Pietal
5387568458 [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours am: 0d3f936b8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb01e635df3c610fe2c907bdb59b09b38e1f8e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 16:06:19 +00:00
TreeHugger Robot
f76ea6006a Merge "Prevent exfiltration of system files via avatar picker." into sc-dev am: 43e0f944cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748987

Change-Id: I9a1ae98fe5680fc9bf11ba2641b3dbd73d9de954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 16:06:12 +00:00
Matt Pietal
0b21b97d57 [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours am: e32da18b5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8ef18cf31bc22166fc91918f407050375ccd14f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 15:53:52 +00:00
Matt Pietal
0d3f936b8b [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f3df0fe8488e5f874434823f9c4af284a8f3f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 15:53:20 +00:00
TreeHugger Robot
a30bf19d1c Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev 
* changes:
  [automerge] Prevent exfiltration of system files via avatar picker. 2p: 1b48ca6b7f
  Prevent exfiltration of system files via avatar picker.
 2022-09-28 15:37:33 +00:00
TreeHugger Robot
43e0f944cb Merge "Prevent exfiltration of system files via avatar picker." into sc-dev 2022-09-28 15:37:33 +00:00
Matt Pietal
e32da18b5e [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf19ede4651fb9f6187c4bac9f5b844061d438fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:53:46 +00:00
Matt Pietal
feba47c36a [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia105005b59b08288288fd1cfc7e139080fa8df00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:53:24 +00:00
Matt Pietal
974a8471ea [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a7ec8e03a49993aa99f2b8317755b1569e70b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:24:54 +00:00
Matt Pietal
4b70b75d1c [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6b7f47d6cdb87b4861b925a1fa0a2db742632b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:24:30 +00:00
Matt Pietal
4f404a5015 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040

Change-Id: Id5d34e9689120d991ca8904938c38c81cd018ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 13:57:36 +00:00
Matt Pietal
d78f1693ef [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040

Change-Id: Ie7874f87fa568f76047a9e08dae3d406b7b565f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 12:52:00 +00:00
Matt Pietal
fab68f3c0f [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-dev am: d829ed5908 -s ours am: 1f05e19f47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dba40a15c3ff7a5e5bd6007df641b070638a1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:50:27 +00:00
Matt Pietal
2127e8deec [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc38a am: 2fdf59ef45 -s ours am: 1702e5f4dd -s ours am: 69194b040a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5e812067fe7b9407bf5483356d6902e91bf31c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:50:17 +00:00
Matt Pietal
f22c091224 [automerger skipped] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc2146966b am: dc0ba857f2 -s ours am: 5820c126ed -s ours am: bd3fa738bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4751da71660d02efa65f9b9a797dd12a6b6a093c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:50:15 +00:00
Matt Pietal
c33c129070 [automerger skipped] Merge changes from topic "presubmit-am-b344c51c0b2b40219ea014db7d70478f" into sc-qpr1-dev am: 98ef8f1675 -s ours 
am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 bcebd3e9b9 is already in history

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

Change-Id: I75abb781d89410b7b215f8a2538c3c33691ba2a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:50:06 +00:00
Matt Pietal
25a05a2530 [automerger skipped] [automerge] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing 2p: 18ddad1f5a am: bd1f3638e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e004c54e6c1df2659af0232ada1a52c23508e65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:50:00 +00:00
Matt Pietal
1f05e19f47 [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-dev am: d829ed5908 -s ours 
am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 18ddad1f5a is already in history

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

Change-Id: I37ee766495cdc0a0e9c53a39b122dfb53e78d08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:47:10 +00:00
Matt Pietal
69194b040a [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc38a am: 2fdf59ef45 -s ours am: 1702e5f4dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8bbb2d3df0e9c4829dcc8a4b6e8ffdaeafb3886c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:46:58 +00:00
Matt Pietal
bd3fa738bb [automerger skipped] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc2146966b am: dc0ba857f2 -s ours am: 5820c126ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie25bc4736ffec5214c9864a89ab4ab3a21cc4ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:46:54 +00:00
Matt Pietal
2663e8aa43 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev 2022-09-27 19:25:13 +00:00
Matt Pietal
d829ed5908 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-dev 2022-09-27 19:24:52 +00:00
Matt Pietal
98ef8f1675 Merge changes from topic "presubmit-am-b344c51c0b2b40219ea014db7d70478f" into sc-qpr1-dev 
* changes:
  [automerge] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing 2p: 18ddad1f5a
  [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing
 2022-09-27 19:24:45 +00:00
Matt Pietal
1702e5f4dd [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc38a am: 2fdf59ef45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b89264303737e8e8d92045fa517c367235d5908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:12:48 +00:00
Matt Pietal
5820c126ed [automerger skipped] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc2146966b am: dc0ba857f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bf9393b97cabfc6bed5dd3eb6c5e1cdfd7dcf49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:12:34 +00:00
Matt Pietal
2fdf59ef45 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc38a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952038

Change-Id: Ic5a7614e9843dbb20f563eb518c761762bf47204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:42:37 +00:00
Matt Pietal
dc0ba857f2 [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc2146966b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952038

Change-Id: I18ee62f32bf7c7364ad5e88643a6cd3ac7f8eb71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:42:26 +00:00
TreeHugger Robot
7d5d1e2a48 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-v2-dev 2022-09-27 18:11:57 +00:00
Matt Pietal
d7710fc38a Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev 2022-09-27 18:05:36 +00:00
Jeff Chang
5c12244497 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours am: 7de60a5467 -s ours am: b482a00d3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I644dbb2c6ddab332195af71ce55ee03cc6839c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:25:04 +00:00
Jeff Chang
3a243d920b [automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours am: 3e91dc1fb9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3ed221fac4e8f84415f4c0e081c63abb453e77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:24:54 +00:00
Jeff Chang
b482a00d3c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours am: 7de60a5467 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I513a2659ed8021487dad0d5c6a64008527ecb787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:03:51 +00:00
Jeff Chang
3e91dc1fb9 [automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c2fff735969279d3614638dce3629b4cde0d928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:03:50 +00:00
Jeff Chang
7de60a5467 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1972c4e34d0ba0fed2997cd3e8ed8c1bc3ba69e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:47:58 +00:00
Jeff Chang
42815bea3f [automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b24dd60de0d2d031fcaadb1dd968a92e8b3fcbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:47:31 +00:00
Jeff Chang
86138c26fd Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761

Change-Id: I4ee9fc257692776e5dbd465f217ca9d10e693892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:12:38 +00:00
Jeff Chang
ef00451cc5 [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761

Change-Id: Ib96e68b166f745d709300479aab5cc5af0da6722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:12:35 +00:00
TreeHugger Robot
a47f079f4f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c879a am: 10166d3457 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ea521c1e96b807c00d36afa484ef84a62f02ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:00:24 +00:00
TreeHugger Robot
54b2bc036b Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-qpr1-dev am: 40b5a52b49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706

Change-Id: Ice3d46fb80c8df3f084d248a1e1e0c501853d793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:00:14 +00:00
Jeff Chang
8e944c7e5d [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f am: c30420a5cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2686037bd49fc85c1f3ed8fed4515726bc38b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:00:09 +00:00
TreeHugger Robot
10166d3457 Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c879a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706

Change-Id: Ib156105e456ba1c7e5542a0261f532de3a490322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 01:56:50 +00:00
Jeff Chang
d667038512 Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev 2022-09-26 01:43:42 +00:00
TreeHugger Robot
0c000c879a Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev 2022-09-26 01:25:55 +00:00
TreeHugger Robot
40b5a52b49 Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-qpr1-dev 
* changes:
  [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f
  [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied
 2022-09-26 01:25:55 +00:00