Merge changes from topic "am-7a5f52f47235411fa8dfee28cc6f9acb" 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: 382e2b6a55 -s ours am: 9e7d057d63 -s ours am: a9fad69c80 -s ours am: 03e06403cb -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: 32cee82670 -s ours am: 716c9b3d84 -s ours am: 9b8453bca8 -s ours am: 3115eb63ce -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: c2726df714 -s ours am: 45d6a8a9e6 -s ours am: 1f7af138ac -s ours am: 1de734bcfe -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: b29063c035 -s ours am: fc37c36c41 -s ours am: dd977d092d -s ours am: c1371bcea3 -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: 9ebbc45594 -s ours am: 97df5e8b63 -s ours am: f601af78e9 -s ours am: 6dc31bfaba -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: 68f347d215 -s ours am: 144ab7db52 -s ours am: 9346eb8414 -s ours am: 2c283fbd3b -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: aa7e540eff -s ours am: 5afbc7f257 -s ours am: 2c90b00ed0 -s ours am: 0d471528f3 -s ours

This commit is contained in:

Automerger Merge Worker

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

committed by

Android (Google) Code Review

parent 7779e0927c 5db75a7e69

commit f6419dd360

Merge changes from topic "am-7a5f52f47235411fa8dfee28cc6f9acb" into tm-d1-dev-plus-aosp

Diff Content Not Available