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

Commit c152396c authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Block CE SharedPreferences access before unlocked. 

Otherwise we'll end up "loading" an empty XML file because the errno
is ignored, and then we'll overwrite the real XML data later once
the user is unlocked.

Test: builds, boots
Bug: 36252783
Change-Id: If185e552f661894f79842afaa4e56ab4d796ce2c
parent 5dd59219

core/java/android/app/ContextImpl.java

+8 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.IStorageManager;

import android.system.ErrnoException;

import android.system.Os;
@@ -365,6 +366,13 @@ class ContextImpl extends Context { 
    @Override

    public SharedPreferences getSharedPreferences(File file, int mode) {

        checkMode(mode);

        if (getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.O) {

            if (isCredentialProtectedStorage()

                    && !getSystemService(UserManager.class).isUserUnlocked()) {

                throw new IllegalStateException("SharedPreferences in credential encrypted "

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

            }

        }

        SharedPreferencesImpl sp;

        synchronized (ContextImpl.class) {

            final ArrayMap<File, SharedPreferencesImpl> cache = getSharedPreferencesCacheLocked();