Merge changes from topic "am-4a6e50c98b7c493ca8be34f1a3abf1b2" into tm-d1-dev-plus-aosp

* changes:
  [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: 5589682f84 -s ours am: d6bfc716ec -s ours am: df092b720b -s ours am: 7d9bf7bbab -s ours
  [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: 873280e588 -s ours am: bfcb7f53de -s ours am: b87de79cdd -s ours am: 0bbcd49d88 -s ours
  [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: 1607beeb83 -s ours am: 798e6d78c6 -s ours am: e071fa6574 -s ours am: a2738f4b24 -s ours
  [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: 702169ebe7 -s ours am: 0fc8902874 -s ours am: 20664186b9 -s ours am: 636ae464d2 -s ours
  [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: 00f6398e69 -s ours am: e523e5de72 -s ours am: 00a0d7595a -s ours am: 278e4ac5c2 -s ours
  [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: bc8f7869a2 -s ours am: 1c53dec76a -s ours am: aa4f6435a0 -s ours am: f239b25103 -s ours
  [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: 34842572ca -s ours am: 1314db8f3e -s ours am: f26b98e73e -s ours am: 7d196d4bd0 -s ours

This commit is contained in:

Automerger Merge Worker

2022-04-25 21:06:08 +00:00

committed by

Android (Google) Code Review

parent f181a68195 1a40f8f0ea

commit d3a8c447b4

Merge changes from topic "am-4a6e50c98b7c493ca8be34f1a3abf1b2" into tm-d1-dev-plus-aosp

Diff Content Not Available