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

Commit fd005ad3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adds user id on exception thrown by getSharedPreferences()"

parents d6a95f19 7fa150d5

core/java/android/app/ContextImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -601,7 +601,8 @@ class ContextImpl extends Context { 
                            && !getSystemService(UserManager.class)

                                    .isUserUnlockingOrUnlocked(UserHandle.myUserId())) {

                        throw new IllegalStateException("SharedPreferences in credential encrypted "

                                + "storage are not available until after user is unlocked");

                                + "storage are not available until after user (id "

                                + UserHandle.myUserId() + ") is unlocked");

                    }

                }

                sp = new SharedPreferencesImpl(file, mode);
@@ -3317,7 +3318,6 @@ class ContextImpl extends Context { 
            @Nullable String splitName, @Nullable IBinder token, @Nullable UserHandle user,

            int flags, @Nullable ClassLoader classLoader, @Nullable String overrideOpPackageName) {

        mOuterContext = this;



        // If creator didn't specify which storage to use, use the default

        // location for application.

        if ((flags & (Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE