Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,061 Commits 3 Branches 0 Tags
5cdb1689bb5dcf2b27fb6f68a17e2ef1cc201e6a
Commit Graph

651061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Bolinger
5cdb1689bb Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev 2022-04-22 23:44:03 +00:00
Eric Biggers
76ce5348f3 [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history

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

Change-Id: Ib5a6eb67de330e4250162773d805226d5b0c2657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:25:21 +00:00
Eric Biggers
f07b486484 [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8215414f6dcb9f8db9c8700060a1146a84e424c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:25:20 +00:00
Eric Biggers
fac1d6ed60 [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If74e1d1c0ecc7cca86595b006920151fc415311c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:25:08 +00:00
Eric Biggers
790a5e0467 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a8f1710e07b4ff76dfa868bfc2f968ff2d8c050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:25:06 +00:00
Eric Biggers
7b3aac9d05 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8dd0362b809bf701fd5118d7696d9a8da34a3bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:24:55 +00:00
Eric Biggers
3fea57d1ca [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie97795a07e668817f027aaadcbdafcbc1fbd7694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:24:49 +00:00
Eric Biggers
ff2c282fb4 [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history

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

Change-Id: I647f13be357f4d5d19d2577210113c26324fb8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:01:01 +00:00
Eric Biggers
54a7bd48dc [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85a4346eec74128ae6e9b1bb99e3e96e43c50aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:53 +00:00
Eric Biggers
0f285346e5 [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I915cad24ff570c667508f9de0fef3e69c25df310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:46 +00:00
Eric Biggers
ef37c0da49 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I876562e133dec3532333cf684b95b4d282682bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:38 +00:00
Eric Biggers
39bf332aab [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba7aa9d2bbacce83e543d86e798615d2b3aa0625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:30 +00:00
Eric Biggers
a86355bfef [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0f7bb7babdcc795d81b597625de44e536ff252a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 22:00:24 +00:00
Eric Biggers
5526853e6d Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: Id5460b2d89d889f640893226e1cba232ce1ec0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:36 +00:00
Eric Biggers
4df21cf7ca [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: I534bf5bd4ab88aee8afb8d1bc8f6ab732e966e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:33 +00:00
Eric Biggers
be952611ed [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250

Change-Id: I9f47d7a36a6d3d6c1ba5b82d17f21c15dd9f7235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:31 +00:00
Eric Biggers
4eadb46170 [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249

Change-Id: I641bedd5939fe451bd7c478c2105a5a6652e7e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:28 +00:00
Eric Biggers
d685b63f1a [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248

Change-Id: Icbaf5892b2804757bc831533fbf2adf851f89f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:22 +00:00
Eric Biggers
ee88d1fd14 [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247

Change-Id: I034fc93d091ee1944a5487e58dd61605bc8e19ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 21:39:18 +00:00
Eric Biggers
74c295ea08 Merge changes from topic "unencrypted-dirs-r" into rvc-dev 
* changes:
  [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure
  [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users
  [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only
  [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails
  [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage
 2022-04-20 21:12:39 +00:00
TreeHugger Robot
856b62f907 Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466

Change-Id: Idf4042818a39723474c347afc2ade4aa5e3320e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 20:58:23 +00:00
Eric Biggers
1dd78739ee Ignore errors preparing user storage for existing users am: e667b60402 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416119

Change-Id: I708ff9144a64157b9e70fe2c338d4e809dbcb0f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 20:58:21 +00:00
Eric Biggers
7abafd53c9 UserDataPreparer: reboot to recovery for system user only am: fd31f740ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416118

Change-Id: Ic4265d151a1992b5e0689dbdff605983e0330647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 20:58:19 +00:00
Eric Biggers
ad111e22f8 UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416117

Change-Id: I12c358d7642bb0a29dceee071691bc9d6350ce6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 20:58:11 +00:00
TreeHugger Robot
bc7a25dff4 Merge changes from topic "unencrypted-dirs-s" into sc-dev 
* changes:
  Log to EventLog on prepareUserStorage failure
  Ignore errors preparing user storage for existing users
  UserDataPreparer: reboot to recovery for system user only
  UserDataPreparer: reboot to recovery if preparing user storage fails
  StorageManagerService: don't ignore failures to prepare user storage
 2022-04-20 20:22:16 +00:00
Eric Biggers
63fec800ad [automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416116

Bug: 164488924
Bug: 224585613
Change-Id: I98b32ecd54ad4e2c9dcf7ddba2c836726e5c9995
Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
 2022-04-12 02:52:06 +00:00
Joe Bolinger
8175c6a005 [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. 
Bug: 214261879
Test: atest AuthControllerTest
Test: Manually verify with test apps in bug
Change-Id: I8ae9f2b8a970bf7e5d32121dc358f7d0f0d060b8
 2022-04-08 21:13:25 +00:00
Remi NGUYEN VAN
c14e995495 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: Ie1230d9ce9e590b6174ce9d28cc0106d0058b64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:11:58 +00:00
Remi NGUYEN VAN
2f74509789 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I22822a2d3c5eb82a05455175c4f901bd271aefab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 15:56:13 +00:00
Remi NGUYEN VAN
49f031ea4d Disallow PAP authentication when MPPE is requested am: 4f319df8ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

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

Change-Id: Ie04277d055fb481438470087819c529a7392903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:26:29 +00:00
Remi NGUYEN VAN
4f319df8ff Disallow PAP authentication when MPPE is requested 
MPPE cannot work if PAP is used as authentication, so it is not useful
to allow PAP authentication when MPPE is enforced: establishing the
tunnel would fail anyway with "MPPE required, but MS-CHAP[v2] auth not
performed".
Also users enforcing MPPE may assume that this means PAP will not be
used for authentication, so without this change MPPE enforcement gives a
false sense of security, as PAP uses plain-text credentials.

Bug: 201660636
Test: atest VpnTest
Merged-In: Ie318d45fe44294e97cf38da7f1834cf014cb4417
Change-Id: Ie318d45fe44294e97cf38da7f1834cf014cb4417
(cherry picked from commit 997a4a3926)
 2022-04-07 01:18:19 +00:00
Tyler Gunn
e518ef6409 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

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

Change-Id: I9264ab8f95bec38b438024cc7a65a6b6b720e6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:38:45 +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
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
Tyler Gunn
08f8988bc3 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev 2022-04-06 22:58:29 +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
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
TreeHugger Robot
d716a26d58 [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: Ie1052d196899df0aa598d0fe95b318a6cf737493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:59:26 +00:00
TreeHugger Robot
8531b25d63 Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I8e21c49a0b1d9a9f1d29d46c8f5a6731b1f6731c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:37:26 +00:00