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

Commit a4d1bd17 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Destroy both CE and DE data when corrupted." into nyc-dev am: 436308f8 am: 65c398b6 

am: 087530c9

* commit '087530c9':
  Destroy both CE and DE data when corrupted.

Change-Id: Idb2fc3b96ab2de41f43e977ac6a2a2eb589d7bd4
parents bee17df8 087530c9

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -18843,7 +18843,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