Merge tag 'android-security-10.0.0_r68' of...
Merge tag 'android-security-10.0.0_r68' of https://android.googlesource.com/platform/frameworks/base into staging/lineage-17.1_merge_android-security-10.0.0_r68 Android security 10.0.0 release 68 * tag 'android-security-10.0.0_r68' of https://android.googlesource.com/platform/frameworks/base: DO NOT MERGE Crash invalid FGS notifications [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 Check user unlocked before write to /data/system_ce/0/snapshots Conflicts: services/core/java/com/android/server/wm/TaskSnapshotPersister.java Change-Id: Ibfcea4ae4c26b42f6e2905fef94827a38991120b
Loading
Please register or sign in to comment