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

Commit 02179da3 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Destroy both CE and DE data when corrupted. 

When we find either a CE or DE data directory that has been corrupted,
destroy both CE and DE data together, since internal services like
AccountManager get confused if they find DE data without matching CE
data.

Bug: 28346537
Change-Id: Iaf3694c20e4664536af25a2afeb45fe8a90d8171
parent 24492ae4

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