Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
649,302 Commits 3 Branches 0 Tags
86064a5284987a5c7380f2ba0f2df2c45607a359
Commit Graph

649302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
86064a5284 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a121f0e365dbee6611b76f18fba86d83664aa3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:47:07 +00:00
Julia Reynolds
c822f7cd66 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0515b68504ea8211a27595c6f2e415df11e033d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:28:27 +00:00
Julia Reynolds
cec8c138ed [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb3ad174c4cf360df25d1ec78dc1d237acf07981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:00:58 +00:00
Julia Reynolds
bf6983a9ea DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I57b968cab49f7d3eef8028ea92d571d5b68489e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 20:23:46 +00:00
TreeHugger Robot
c85f627e2b Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I10e81ec0dfe84b84c82a0f5e2d21eac59069dca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 20:14:52 +00:00
TreeHugger Robot
67d1edb349 Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I6cc9a03b4d5ad1db353b99e798620841a0d92ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 20:14:21 +00:00
TreeHugger Robot
afc2de4708 Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I6b1808d2494f9b37f60a7fd53af3e5a89af10939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 20:14:09 +00:00
TreeHugger Robot
e91ae52a85 Merge "Crash invalid FGS notifications" into rvc-qpr-dev 2022-05-12 19:48:54 +00:00
TreeHugger Robot
97fc7b179e Merge "Crash invalid FGS notifications" into rvc-dev 2022-05-12 19:47:14 +00:00
TreeHugger Robot
0d2e7006ce Merge "Update ServiceState broadcast for location permissions" into sc-dev 2022-05-12 14:11:49 +00:00
TreeHugger Robot
a44e416cfa Merge "Add excludedPackages parameter to broadcast" into sc-dev 2022-05-12 04:39:14 +00:00
Sarah Chin
f8e793e6ed Update ServiceState broadcast for location permissions 
Add extra checks for master location switch and location bypass packages
and send broadcasts accordingly.

Test: Verify location is sanitized using testapp
Test: Verify privacy dashboard with MLS on/off
Test: Verify location is sanitized/unsanitized with bypass list
Bug: 230919427
Bug: 210118427
Change-Id: I9784527d6d79235830f562c1944562f5a6ac1fb3
Merged-In: I9784527d6d79235830f562c1944562f5a6ac1fb3
 2022-05-11 23:08:12 +00:00
Evan Severson
c0ce69bc8d Add excludedPackages parameter to broadcast 
This parameter is useful for when a broadcast's intent is not targeting
specific package and it is not wanted to be delievered to a specific
one.

Test: Install two apps and create shell command argument to exlude
        packages, verify the correct packages can receive or get
	skipped. Verified with manifest and registered receivers.
Bug: 231635380
Bug: 210118427

Merged-In: I9a331f71c7052b294d4eada0f0f658dba989d881
Change-Id: I9a331f71c7052b294d4eada0f0f658dba989d881
 2022-05-11 18:49:24 +00:00
Victor Berchet
4fea97557a [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f8299748dd8971d7b0b4ec978ed64493c21f510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:02:06 +00:00
Victor Berchet
ae0479380a [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e265bf6eac9c52fe31f63425fc06147cd3b64ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:01:49 +00:00
Victor Berchet
83b4fadcb7 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31a2312fc7520654a27fe3736c55650746c744d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:37:19 +00:00
Victor Berchet
3020cc3897 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08f7f5a2b91a7c1a096913f4a083c46e997543e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:37:13 +00:00
Victor Berchet
938c647b7a [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3201f14b5a79528eec09c5eb5d6d4647d32597d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:13:11 +00:00
Victor Berchet
d93fd9dd8e [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86c387fdcbbc16923d096af5795c168c1a853a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:13:01 +00:00
Victor Berchet
f44dc5cee3 Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev 2022-05-02 21:52:05 +00:00
Victor Berchet
a492c2f2d9 Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" 
This reverts commit 1ca6f8ddb8.

Reason for revert: DroidMonitor: Potential culprit for Bug 231171562 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Ib5819de2ce4e60deae5676eed9947cbbb759be10
 2022-05-02 20:29:01 +00:00
Wenhao Wang
b15df33926 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours am: 548bf8cc64 -s ours am: 203de0f0bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec39543e22ed3a94bf5955079596afe8e8b8d038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:57:52 +00:00
Wenhao Wang
0d3014b957 [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours am: 764c1ec926 -s ours am: 583031670c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85fcce746af8013ed9cca302a8db0460334384a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:57:30 +00:00
Wenhao Wang
203de0f0bc [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours am: 548bf8cc64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I944d361c3735abbc19f881e73c5ec9723f9f1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:06:38 +00:00
Wenhao Wang
583031670c [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours am: 764c1ec926 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I986f71ba31b73494acd5bccf7f2e74013ce0c8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:06:28 +00:00
Wenhao Wang
548bf8cc64 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe987f2aeb4c39d9f7d9db395b22215e4f017b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:51:04 +00:00
Wenhao Wang
7f401aa888 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 85c00b98a6 is already in history

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

Change-Id: I196db203b04b4c90b7907759f523f1e18aa12f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:44:48 +00:00
Wenhao Wang
764c1ec926 [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4a62bdee1f85343228bb6179e3a16433b7c1f6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:43:50 +00:00
James Wei
022e537884 USB: Increase debounce time for DISCONNECT processing (revised) 
Original patch: aosp/1539944

Bug: 207057578
Test: See details in b/209342433
Change-Id: I7ff58a1a9755939ccb26dad61969902ec91f2225
Signed-off-by: James Wei <jameswei@google.com>
(cherry picked from commit 06626cef7a)
Merged-In: I7ff58a1a9755939ccb26dad61969902ec91f2225
 2022-04-29 07:32:44 +00:00
Wenhao Wang
1ca6f8ddb8 [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: I248486e7eb6210ba54b30276cfce15a18dc5f9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 21:00:00 +00:00
Wenhao Wang
5027b02797 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd0c -s ours am: a78e5a9d05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97a854cb9335f9b5480d6de4937802a86b8b872c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:50:55 +00:00
Wenhao Wang
7584348369 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 2e1c70b6b2 -s ours am: 15810f6001 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13c450800893e06352f0d5b300e38a5b9a1c68f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:50:37 +00:00
Wenhao Wang
a78e5a9d05 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd0c -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 52bd9bb597 is already in history

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

Change-Id: I4399a5293675798602da8aedbbd63ddfc1d1dafc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:39:59 +00:00
Wenhao Wang
15810f6001 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 2e1c70b6b2 -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 52bd9bb597 is already in history

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

Change-Id: I27d80aec2d2600c0dc4ea53e22c7424593405263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:39:56 +00:00
Wenhao Wang
268fde537d [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 52bd9bb597 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09f499ca94d7ae72d6b0e2a99cf9f69afee4cf7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:39:19 +00:00
Wenhao Wang
4228c9bd0c Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev 2022-04-28 19:45:04 +00:00
Wenhao Wang
248bbf2dca Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev 2022-04-28 19:44:46 +00:00
Wenhao Wang
b1099290b8 DO NOT MERGE Suppress notifications when device enter lockdown 
This CL makes the following modifcations:
1. Add LockPatternUtils.StrongAuthTracker to monitor
the lockdown mode status of the phone.
2. Call mListeners.notifyRemovedLocked with all the
notifications in the mNotificationList when entering
the lockdown mode.
3. Call mListeners.notifyPostedLocked with all the
notifications in the mNotificationList when exiting
the lockdown mode.
4. Dismiss the function calls of notifyPostedLocked,
notifyRemovedLocked, and notifyRankingUpdateLocked
during the lockdown mode.

The CL also adds corresponding tests.

Bug: 173721373
Test: atest NotificationManagerServiceTest
Test: atest NotificationListenersTest
Test: manually verify the paired device cannot receive
notifications when the host phone is in lockdown mode.
Ignore-AOSP-First: pending fix for a security issue.

Change-Id: I7e83544863eeadf8272b6ff8a9bb8136d6466203
Merged-In: I7e83544863eeadf8272b6ff8a9bb8136d6466203
(cherry picked from commit 3cb6842a05)
 2022-04-25 17:58:54 -07:00
Wenhao Wang
85c00b98a6 DO NOT MERGE Suppress notifications when device enter lockdown 
This CL makes the following modifcations:
1. Add LockPatternUtils.StrongAuthTracker to monitor
the lockdown mode status of the phone.
2. Call mListeners.notifyRemovedLocked with all the
notifications in the mNotificationList when entering
the lockdown mode.
3. Call mListeners.notifyPostedLocked with all the
notifications in the mNotificationList when exiting
the lockdown mode.
4. Dismiss the function calls of notifyPostedLocked,
notifyRemovedLocked, and notifyRankingUpdateLocked
during the lockdown mode.

The CL also adds corresponding tests.

Bug: 173721373
Test: atest NotificationManagerServiceTest
Test: atest NotificationListenersTest
Test: manually verify the paired device cannot receive
notifications when the host phone is in lockdown mode.
Ignore-AOSP-First: pending fix for a security issue.

Change-Id: I7e83544863eeadf8272b6ff8a9bb8136d6466203
Merged-In: I7e83544863eeadf8272b6ff8a9bb8136d6466203
(cherry picked from commit 3cb6842a05)
 2022-04-25 15:29:35 -07:00
Wenhao Wang
52bd9bb597 DO NOT MERGE Suppress notifications when device enter lockdown 
This CL makes the following modifcations:
1. Add LockPatternUtils.StrongAuthTracker to monitor
the lockdown mode status of the phone.
2. Call mListeners.notifyRemovedLocked with all the
notifications in the mNotificationList when entering
the lockdown mode.
3. Call mListeners.notifyPostedLocked with all the
notifications in the mNotificationList when exiting
the lockdown mode.
4. Dismiss the function calls of notifyPostedLocked,
notifyRemovedLocked, and notifyRankingUpdateLocked
during the lockdown mode.

The CL also adds corresponding tests.

Bug: 173721373
Test: atest NotificationManagerServiceTest
Test: atest NotificationListenersTest
Test: manually verify the paired device cannot receive
notifications when the host phone is in lockdown mode.
Ignore-AOSP-First: pending fix for a security issue.

Change-Id: I7e83544863eeadf8272b6ff8a9bb8136d6466203
Merged-In: I7e83544863eeadf8272b6ff8a9bb8136d6466203
(cherry picked from commit 3cb6842a05)
 2022-04-25 22:13:06 +00:00
Wenhao Wang
2e1c70b6b2 DO NOT MERGE Suppress notifications when device enter lockdown 
This CL makes the following modifcations:
1. Add LockPatternUtils.StrongAuthTracker to monitor
the lockdown mode status of the phone.
2. Call mListeners.notifyRemovedLocked with all the
notifications in the mNotificationList when entering
the lockdown mode.
3. Call mListeners.notifyPostedLocked with all the
notifications in the mNotificationList when exiting
the lockdown mode.
4. Dismiss the function calls of notifyPostedLocked,
notifyRemovedLocked, and notifyRankingUpdateLocked
during the lockdown mode.

The CL also adds corresponding tests.

Bug: 173721373
Test: atest NotificationManagerServiceTest
Test: atest NotificationListenersTest
Test: manually verify the paired device cannot receive
notifications when the host phone is in lockdown mode.
Ignore-AOSP-First: pending fix for a security issue.

Change-Id: I7e83544863eeadf8272b6ff8a9bb8136d6466203
Merged-In: I7e83544863eeadf8272b6ff8a9bb8136d6466203
(cherry picked from commit 3cb6842a05)
 2022-04-25 15:07:40 -07:00
Eric Biggers
5589682f84 [automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history

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

Change-Id: I595cdd8bae0081fb867a62e2bc0194072180b1d9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:17:38 +00:00
Eric Biggers
873280e588 [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours am: 3a4170de4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2d939095abe20d3e9a2e49dd4244e42523169dd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:17:20 +00:00
Eric Biggers
1607beeb83 [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b84 am: 7271432de9 -s ours am: d1951beae5 -s ours am: 04ef13bd8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e54ed942b99640afb4b89f819bc9ba9535b3c79
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:17:13 +00:00
Eric Biggers
702169ebe7 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b724 am: 6976474816 -s ours am: 4ec9daeef7 -s ours am: 3d81f75d82 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6fbed4def949f2cf0d3d6bf3ccc012862bc02c7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:16:49 +00:00
Eric Biggers
00f6398e69 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf720085ce87e3963d9ba255e4bac2737b2ac8ef
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:16:42 +00:00
Eric Biggers
bc8f7869a2 [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ecd4 am: 9d4c8b604a -s ours am: 42b5cbc663 -s ours am: 9c2aaf60a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bdc9babd4d9137cfb8148f7fb707ecb9796b35b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:16:20 +00:00
Guo Li
34842572ca [automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours 
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history

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

Change-Id: I00782e2bd155cad54693fc8dc36edd371d5765aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 19:16:02 +00:00
Eric Biggers
58c7fa1a92 [automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours 
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history

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

Change-Id: I897abfec9e7eab4e6573b38e7e2c36758672be99
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:58:41 +00:00
Eric Biggers
3a4170de4b [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8 am: 51fbb8e819 -s ours am: 393fde64bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf976a1974771063c100ff6ccc24f6ea54885371
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 18:58:32 +00:00