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

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

Merge "Only destroy the storage area that had trouble." into oc-mr1-dev 

am: 9aa5b26a

Change-Id: I18e3a2797321c97e92d9cfd0e09b3c41e2e51683
parents 4b559a3b 9aa5b26a

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

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ class UserDataPreparer { 
        } catch (Exception e) {

            logCriticalInfo(Log.WARN, "Destroying user " + userId + " on volume " + volumeUuid

                    + " because we failed to prepare: " + e);

            destroyUserDataLI(volumeUuid, userId,

                    StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);

            destroyUserDataLI(volumeUuid, userId, flags);



            if (allowRecover) {

                // Try one last time; if we fail again we're really in trouble