Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
759,636 Commits 3 Branches 0 Tags
bb5603d69c41bbf5aa0a4d799c86925cd8a93bbd
Commit Graph

759636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
efaa8b3d1b [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 58e958133f -s ours am: 2ab56508dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ff92f3ecf967f90947e5a1d44f0791d9eaecc92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:38:29 +00:00
Jonathan Scott
25c5b4cfc5 [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: 8b4fe475a8 -s ours am: 18a459822e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f5fa4a542c855bc9b58f2ea726f16088c7cd30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:38:21 +00:00
Jerry Chang
4c8378aa62 Merge "Fix wrong touch region of split sreen" into tm-dev 2022-04-07 00:31:07 +00:00
Jerry Chang
78b9a4f1ab Merge changes from topic "presubmit-am-85a3f29dd446454a82629bc9ff08b102" into tm-mainline-prod 
* changes:
  [automerge] Fix wrong touch region of split sreen 2p: 43d5948314
  Fix wrong touch region of split sreen
 2022-04-07 00:31:07 +00:00
Shan Huang
f608b18317 Merge "Split predictive back bitmask flags into a few boolean flags." into tm-dev 2022-04-07 00:24:47 +00:00
TreeHugger Robot
94bba02785 Merge "Check that InputDevice isn't null and add annotations" into tm-dev 2022-04-07 00:20:58 +00:00
TreeHugger Robot
eccc92364a [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 5d87e734a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida2d144165452ce3660f5abb5f2db8b3c835ef86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:16:56 +00:00
Jonathan Scott
f44dcac8af [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: cf54b5aad5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefb222d250821b2e5b02e280fba0ac0f12b2dcf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:16:44 +00:00
TreeHugger Robot
2ab56508dc [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 58e958133f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21dbbd1657b46707bfc166aaf0e15cbbcccc9df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:16:29 +00:00
Jonathan Scott
18a459822e [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: 8b4fe475a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id00e21bafa61a9174b85c68a461400a892d8c77d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:16:26 +00:00
TreeHugger Robot
76731ad5ff [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am: d716a26d58 -s ours am: cc47da056a -s ours am: 25841e112a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27bdaa2cd208f889c25b90248e77b2130a403bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:15:48 +00:00
Jonathan Scott
4e794bc62e [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: 3174a8bc5a -s ours am: 1c12b23d27 -s ours am: 09523a11bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9dbefb5628a9c7d380ed6df6be19e785a40283b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:15:26 +00:00
Tyler Gunn
74f9b7f432 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

Change-Id: I73cf3414a8bd2067fa673fe198244c86eb2726c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:15:07 +00:00
Presubmit Automerger Backend
de7cecc646 [automerge] Handling exception when per-use prompt cannot be generated 2p: f41f0dea68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17575366

Bug: 228037077
Change-Id: I235b80085f4e800255f4d72baad082c79ae3eff5
 2022-04-06 23:29:26 +00:00
eunjeongshin
f41f0dea68 Handling exception when per-use prompt cannot be generated 
Decline full device log access when the system fails to generate per-use prompt for
device log access

Bug: 228037077
Test: CtsVerifier
Ignore-AOSP-First: pending fix for logcat privacy issue
Change-Id: Ic1e1f4891a8f198e400e942142a60c2031c9439f
 2022-04-06 23:28:43 +00:00
Tyler Gunn
8193edd104 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

Change-Id: I7843acc6edf27ed2d8eece6dc2de7a05aa925b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:18:55 +00:00
TreeHugger Robot
58e958133f [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I554fe339239a0581021bda208444f846d844a381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:10:53 +00:00
Jonathan Scott
8b4fe475a8 [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1fa066a66afc97a76304fef898b44a63dd5fb9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:10:49 +00:00
TreeHugger Robot
5d87e734a1 [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fec9a0ec36c49d3011efdb96ab3d0e5e356ce03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:10:03 +00:00
Jonathan Scott
cf54b5aad5 [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89da18b2dbe5b64eca8d86cf3987599bd737b0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:10:00 +00:00
TreeHugger Robot
25841e112a [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am: d716a26d58 -s ours am: cc47da056a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f82ff4e4e7fd977bf8ae9499b7786db335edbf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:09:57 +00:00
Jonathan Scott
09523a11bb [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: 3174a8bc5a -s ours am: 1c12b23d27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6fef3d855d6f67c10836e3c56a2977f0e75dc27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:09:31 +00:00
Tyler Gunn
08f8988bc3 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev 2022-04-06 22:58:29 +00:00
Lucas Dupin
bc1d1ad091 Merge "Remove IPC from critical path" into tm-dev am: ee9ba8ff1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17575270

Change-Id: Id021e9722a29525817c688e138e4e471e3b85221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:52:51 +00:00
TreeHugger Robot
29837538cf [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am: 190471c69c -s ours am: fa389e532b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iede29e16757ea7a1df8e74780435aef1ee5d9e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:52:33 +00:00
Jonathan Scott
1f2fb324cc [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: b7fd49e0d4 -s ours am: ef63274440 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ef5d2d5cd31cfb983256ed72df0d64799a23323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:52:30 +00:00
Pablo Gamito
a9225ea187 Merge "Demote flaky flicker tests" into tm-dev am: 12b486a3c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17606694

Change-Id: I149e716db8bd49cd133fbd8e61b027dff535ca56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:52:07 +00:00
Treehugger Robot
cd5c905a00 Merge "Change aapt2 to specify full protos" am: 6787226865 am: 3da3dce716 am: ccd8e91bf1 am: 2f58e1c38c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I3d6e86d8137d8606c645289335a9eafcf256df97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:51:41 +00:00
TreeHugger Robot
3173df5130 [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 8531b25d63 -s ours am: 36f23cd8ac -s ours am: b7847a9aaa -s ours am: d3f2f43fdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5624362b6d8734937db7e01f69d784c455fafa85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:51:13 +00:00
Automerger Merge Worker
596879bb6c Merge changes from topic "am-c418ed2ce8084abd8ce2fcc75e7baf7e" into tm-dev am: f93b8f0e0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I231f74105ed84114cbbe6e0e0fd4d9c4a2137cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:51:03 +00:00
Jonathan Scott
eb08f2a185 [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours am: e59b3947e9 -s ours am: da3ed035aa -s ours am: ab5d7854da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41e74eadfc80c776cb624fa73515d19e97f778d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:51:01 +00:00
Lucas Dupin
ee9ba8ff1b Merge "Remove IPC from critical path" into tm-dev 2022-04-06 22:50:11 +00:00
Ruslan Tkhakokhov
3efb5add1b [automerger skipped] Merge "Skip restore of read-only directories" into tm-dev am: 59317a8d00 -s ours 
am skip reason: Merged-In I644a5784fb42352ba28ac944d3aa3564b0215a78 with SHA-1 5dd86bcb8a is already in history

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

Change-Id: I8480a04ad367b167d98334c8b14115c6c264f103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:49:49 +00:00
TreeHugger Robot
fa389e532b [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am: 190471c69c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If44c5e370ae4117afb78f8e3863e2a9707677392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:53 +00:00
TreeHugger Robot
d8ced52b49 Merge "Add a flicker test to verify IME snapshot when dismissing dialog" into tm-dev am: cd9af56183 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17411126

Change-Id: I01809f3ee77e65be12dc2786a00ff358feeefa9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:47 +00:00
TreeHugger Robot
cc47da056a [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am: d716a26d58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99c991458aba3e9f1df9f2ccc111006568058acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:44 +00:00
Jonathan Scott
ef63274440 [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: b7fd49e0d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic89c7512dd8767088faa192a4a347d6b4cfcafdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:42 +00:00
Jonathan Scott
1c12b23d27 [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: 3174a8bc5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6925adb48b9b73a59d156396a9c82fedbe307c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:40 +00:00
TreeHugger Robot
607cc6acf4 [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb2467d2beb1a7a46c6354382fc6108bb5457c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:08 +00:00
Evan Laird
3f8f12f0ee Merge "Add carrier config support to operator name in statusbar" into tm-dev am: 32e1fa353b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17201785

Change-Id: If5779ea46274d10651835bfbf200592b8ce9ac5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:47:48 +00:00
Jonathan Scott
4d47369e41 [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a2b23cc9d7258d47e468f780928a32a4503bde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:47:37 +00:00
Pablo Gamito
12b486a3c9 Merge "Demote flaky flicker tests" into tm-dev 2022-04-06 21:50:56 +00:00
Treehugger Robot
2f58e1c38c Merge "Change aapt2 to specify full protos" am: 6787226865 am: 3da3dce716 am: ccd8e91bf1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I23fd8af293fc5acd7748294d6cb61289565b8c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:32:06 +00:00
Treehugger Robot
ccd8e91bf1 Merge "Change aapt2 to specify full protos" am: 6787226865 am: 3da3dce716 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I8c4024295ea6d5b5c1578459fd98c3e892338219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:26:49 +00:00
TreeHugger Robot
d3f2f43fdb [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 8531b25d63 -s ours am: 36f23cd8ac -s ours am: b7847a9aaa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaba0f48a0c9bceeb02bbfee2cb837caf2efc3558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:25:56 +00:00
Automerger Merge Worker
f93b8f0e0d Merge changes from topic "am-c418ed2ce8084abd8ce2fcc75e7baf7e" into tm-dev 
* changes:
  Merge changes from topic "sv2sec-sc-dev" into sc-qpr1-dev am: 9c59526a34 am: 22be71ece0 am: d8b405adbd
  [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours am: e59b3947e9 -s ours am: da3ed035aa -s ours
 2022-04-06 21:25:48 +00:00
TreeHugger Robot
885faedcbc Merge changes from topic "sv2sec-sc-dev" into sc-qpr1-dev am: 9c59526a34 am: 22be71ece0 am: d8b405adbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: Ida7c017fc359bdeccd6518f80e1478f5190fbdb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:25:03 +00:00
Jonathan Scott
ab5d7854da [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours am: e59b3947e9 -s ours am: da3ed035aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76c731f6cae57c1d4321433f84fb0028ebb2a25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:24:41 +00:00
Ruslan Tkhakokhov
59317a8d00 Merge "Skip restore of read-only directories" into tm-dev 2022-04-06 21:24:36 +00:00
Ruslan Tkhakokhov
159f0dfda4 Merge changes from topic "presubmit-am-db9236ab5c214609adab13d35320188d" into tm-mainline-prod 
* changes:
  [automerged blank] Skip restore of read-only directories 2p: 5dd86bcb8a
  Skip restore of read-only directories
 2022-04-06 21:24:35 +00:00