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

Commit 5bc622e4 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

* commit '436308f8':
  Destroy both CE and DE data when corrupted.

Change-Id: Ic60599ed7ee0cd200d1b95690e5e687bd403cfad
parents 44c38e3d 436308f8

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

+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