Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 436308f8 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Destroy both CE and DE data when corrupted." into nyc-dev

parents 3a10c1e8 02179da3
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -18819,7 +18819,8 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
        } catch (Exception e) {
            logCriticalInfo(Log.WARN, "Destroying user " + userId + " on volume " + volumeUuid
                    + " because we failed to prepare: " + e);
            destroyUserDataLI(volumeUuid, userId, flags);
            destroyUserDataLI(volumeUuid, userId,
                    StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);
            if (allowRecover) {
                // Try one last time; if we fail again we're really in trouble