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

Commit 7271432d authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381



Change-Id: Ic637e5b26c0bb2561497dfb7ba1cf5300bd6af99
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69764748 493aa93b

core/java/android/os/UserManagerInternal.java

+8 −0
Original line number Diff line number Diff line
@@ -221,4 +221,12 @@ public abstract class UserManagerInternal { 
     */

    public abstract boolean isSettingRestrictedForUser(String setting, int userId, String value,

            int callingUid);



    /**

     * Returns {@code true} if the system should ignore errors when preparing

     * the storage directories for the user with ID {@code userId}. This will

     * return {@code false} for all new users; it will only return {@code true}

     * for users that already existed on-disk from an older version of Android.

     */

    public abstract boolean shouldIgnorePrepareStorageErrors(int userId);

}

services/core/java/com/android/server/StorageManagerService.java

+10 −1
Original line number Diff line number Diff line
@@ -2847,11 +2847,20 @@ class StorageManagerService extends IStorageManager.Stub 


        try {

            mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags);

        } catch (RemoteException e) {

        } catch (Exception e) {

            Slog.wtf(TAG, e);

            // Make sure to re-throw this exception; we must not ignore failure

            // to prepare the user storage as it could indicate that encryption

            // wasn't successfully set up.

            //

            // Very unfortunately, these errors need to be ignored for broken

            // users that already existed on-disk from older Android versions.

            UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class);

            if (umInternal.shouldIgnorePrepareStorageErrors(userId)) {

                Slog.wtf(TAG, "ignoring error preparing storage for existing user " + userId

                        + "; device may be insecure!");

                return;

            }

            throw new RuntimeException(e);

        }

    }

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

+42 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ public class UserManagerService extends IUserManager.Stub { 
    private static final String TAG_SEED_ACCOUNT_OPTIONS = "seedAccountOptions";

    private static final String TAG_LAST_REQUEST_QUIET_MODE_ENABLED_CALL =

            "lastRequestQuietModeEnabledCall";

    private static final String TAG_IGNORE_PREPARE_STORAGE_ERRORS =

            "ignorePrepareStorageErrors";

    private static final String ATTR_KEY = "key";

    private static final String ATTR_VALUE_TYPE = "type";

    private static final String ATTR_MULTIPLE = "m";
@@ -282,6 +284,14 @@ public class UserManagerService extends IUserManager.Stub { 


        private long mLastRequestQuietModeEnabledMillis;



        /**

         * {@code true} if the system should ignore errors when preparing the

         * storage directories for this user. This is {@code false} for all new

         * users; it will only be {@code true} for users that already existed

         * on-disk from an older version of Android.

         */

        private boolean mIgnorePrepareStorageErrors;



        void setLastRequestQuietModeEnabledMillis(long millis) {

            mLastRequestQuietModeEnabledMillis = millis;

        }
@@ -290,6 +300,14 @@ public class UserManagerService extends IUserManager.Stub { 
            return mLastRequestQuietModeEnabledMillis;

        }



        boolean getIgnorePrepareStorageErrors() {

            return mIgnorePrepareStorageErrors;

        }



        void setIgnorePrepareStorageErrors() {

            mIgnorePrepareStorageErrors = true;

        }



        void clearSeedAccountData() {

            seedAccountName = null;

            seedAccountType = null;
@@ -2438,6 +2456,10 @@ public class UserManagerService extends IUserManager.Stub { 
            serializer.endTag(/* namespace */ null, TAG_LAST_REQUEST_QUIET_MODE_ENABLED_CALL);

        }



        serializer.startTag(/* namespace */ null, TAG_IGNORE_PREPARE_STORAGE_ERRORS);

        serializer.text(String.valueOf(userData.getIgnorePrepareStorageErrors()));

        serializer.endTag(/* namespace */ null, TAG_IGNORE_PREPARE_STORAGE_ERRORS);



        serializer.endTag(null, TAG_USER);



        serializer.endDocument();
@@ -2547,6 +2569,7 @@ public class UserManagerService extends IUserManager.Stub { 
        Bundle baseRestrictions = null;

        Bundle localRestrictions = null;

        Bundle globalRestrictions = null;

        boolean ignorePrepareStorageErrors = true; // default is true for old users



        XmlPullParser parser = Xml.newPullParser();

        parser.setInput(is, StandardCharsets.UTF_8.name());
@@ -2629,6 +2652,11 @@ public class UserManagerService extends IUserManager.Stub { 
                    if (type == XmlPullParser.TEXT) {

                        lastRequestQuietModeEnabledTimestamp = Long.parseLong(parser.getText());

                    }

                } else if (TAG_IGNORE_PREPARE_STORAGE_ERRORS.equals(tag)) {

                    type = parser.next();

                    if (type == XmlPullParser.TEXT) {

                        ignorePrepareStorageErrors = Boolean.parseBoolean(parser.getText());

                    }

                }

            }

        }
@@ -2655,6 +2683,9 @@ public class UserManagerService extends IUserManager.Stub { 
        userData.persistSeedData = persistSeedData;

        userData.seedAccountOptions = seedAccountOptions;

        userData.setLastRequestQuietModeEnabledMillis(lastRequestQuietModeEnabledTimestamp);

        if (ignorePrepareStorageErrors) {

            userData.setIgnorePrepareStorageErrors();

        }



        synchronized (mRestrictionsLock) {

            if (baseRestrictions != null) {
@@ -4047,6 +4078,9 @@ public class UserManagerService extends IUserManager.Stub { 
                            pw.println();

                        }

                    }



                    pw.println("    Ignore errors preparing storage: "

                            + userData.getIgnorePrepareStorageErrors());

                }

            }

            pw.println();
@@ -4394,6 +4428,14 @@ public class UserManagerService extends IUserManager.Stub { 
            return UserRestrictionsUtils.isSettingRestrictedForUser(mContext, setting, userId,

                    value, callingUid);

        }



        @Override

        public boolean shouldIgnorePrepareStorageErrors(int userId) {

            synchronized (mUsersLock) {

                UserData userData = mUsers.get(userId);

                return userData != null && userData.getIgnorePrepareStorageErrors();

            }

        }

    }



    /* Remove all the users except of the system one. */