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

Commit 8fc29cf1 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

API to create SharedPreferences from File. 

Needed to support storage of SharedPreferences on both credential-
encrypted and device-encrypted storage paths.

Bug: 22358539
Change-Id: I576b696951b2a9de817d5be63d31b06f7e166a19
parent 8924e875

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -7809,6 +7809,7 @@ package android.content { 
    method public abstract java.lang.String getPackageResourcePath();

    method public abstract android.content.res.Resources getResources();

    method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public final java.lang.String getString(int);

    method public final java.lang.String getString(int, java.lang.Object...);

    method public abstract java.lang.Object getSystemService(java.lang.String);
@@ -7991,6 +7992,7 @@ package android.content { 
    method public java.lang.String getPackageResourcePath();

    method public android.content.res.Resources getResources();

    method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public java.lang.Object getSystemService(java.lang.String);

    method public java.lang.String getSystemServiceName(java.lang.Class<?>);

    method public android.content.res.Resources.Theme getTheme();
@@ -36198,6 +36200,7 @@ package android.test.mock { 
    method public java.lang.String getPackageResourcePath();

    method public android.content.res.Resources getResources();

    method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public java.lang.Object getSystemService(java.lang.String);

    method public java.lang.String getSystemServiceName(java.lang.Class<?>);

    method public android.content.res.Resources.Theme getTheme();

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -8052,6 +8052,7 @@ package android.content { 
    method public abstract java.lang.String getPackageResourcePath();

    method public abstract android.content.res.Resources getResources();

    method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public final java.lang.String getString(int);

    method public final java.lang.String getString(int, java.lang.Object...);

    method public abstract java.lang.Object getSystemService(java.lang.String);
@@ -8243,6 +8244,7 @@ package android.content { 
    method public java.lang.String getPackageResourcePath();

    method public android.content.res.Resources getResources();

    method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public java.lang.Object getSystemService(java.lang.String);

    method public java.lang.String getSystemServiceName(java.lang.Class<?>);

    method public android.content.res.Resources.Theme getTheme();
@@ -38513,6 +38515,7 @@ package android.test.mock { 
    method public java.lang.String getPackageResourcePath();

    method public android.content.res.Resources getResources();

    method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public java.lang.Object getSystemService(java.lang.String);

    method public java.lang.String getSystemServiceName(java.lang.Class<?>);

    method public android.content.res.Resources.Theme getTheme();

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -7809,6 +7809,7 @@ package android.content { 
    method public abstract java.lang.String getPackageResourcePath();

    method public abstract android.content.res.Resources getResources();

    method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public final java.lang.String getString(int);

    method public final java.lang.String getString(int, java.lang.Object...);

    method public abstract java.lang.Object getSystemService(java.lang.String);
@@ -7991,6 +7992,7 @@ package android.content { 
    method public java.lang.String getPackageResourcePath();

    method public android.content.res.Resources getResources();

    method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public java.lang.Object getSystemService(java.lang.String);

    method public java.lang.String getSystemServiceName(java.lang.Class<?>);

    method public android.content.res.Resources.Theme getTheme();
@@ -36198,6 +36200,7 @@ package android.test.mock { 
    method public java.lang.String getPackageResourcePath();

    method public android.content.res.Resources getResources();

    method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);

    method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);

    method public java.lang.Object getSystemService(java.lang.String);

    method public java.lang.String getSystemServiceName(java.lang.Class<?>);

    method public android.content.res.Resources.Theme getTheme();

core/java/android/app/ContextImpl.java

+23 −18
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ class ContextImpl extends Context { 
    /**

     * Map from package name, to preference name, to cached preferences.

     */

    private static ArrayMap<String, ArrayMap<String, SharedPreferencesImpl>> sSharedPrefs;

    private static ArrayMap<String, ArrayMap<File, SharedPreferencesImpl>> sSharedPrefs;



    final ActivityThread mMainThread;

    final LoadedApk mPackageInfo;
@@ -327,19 +327,6 @@ class ContextImpl extends Context { 


    @Override

    public SharedPreferences getSharedPreferences(String name, int mode) {

        SharedPreferencesImpl sp;

        synchronized (ContextImpl.class) {

            if (sSharedPrefs == null) {

                sSharedPrefs = new ArrayMap<String, ArrayMap<String, SharedPreferencesImpl>>();

            }



            final String packageName = getPackageName();

            ArrayMap<String, SharedPreferencesImpl> packagePrefs = sSharedPrefs.get(packageName);

            if (packagePrefs == null) {

                packagePrefs = new ArrayMap<String, SharedPreferencesImpl>();

                sSharedPrefs.put(packageName, packagePrefs);

            }



        // At least one application in the world actually passes in a null

        // name.  This happened to work because when we generated the file name

        // we would stringify it to "null.xml".  Nice.
@@ -350,11 +337,29 @@ class ContextImpl extends Context { 
            }

        }



            sp = packagePrefs.get(name);

        final File file = getSharedPrefsFile(name);

        return getSharedPreferences(file, mode);

    }



    @Override

    public SharedPreferences getSharedPreferences(File file, int mode) {

        SharedPreferencesImpl sp;

        synchronized (ContextImpl.class) {

            if (sSharedPrefs == null) {

                sSharedPrefs = new ArrayMap<String, ArrayMap<File, SharedPreferencesImpl>>();

            }



            final String packageName = getPackageName();

            ArrayMap<File, SharedPreferencesImpl> packagePrefs = sSharedPrefs.get(packageName);

            if (packagePrefs == null) {

                packagePrefs = new ArrayMap<File, SharedPreferencesImpl>();

                sSharedPrefs.put(packageName, packagePrefs);

            }



            sp = packagePrefs.get(file);

            if (sp == null) {

                File prefsFile = getSharedPrefsFile(name);

                sp = new SharedPreferencesImpl(prefsFile, mode);

                packagePrefs.put(name, sp);

                sp = new SharedPreferencesImpl(file, mode);

                packagePrefs.put(file, sp);

                return sp;

            }

        }

core/java/android/content/Context.java

+24 −2
Original line number Diff line number Diff line
@@ -625,8 +625,30 @@ public abstract class Context { 
     * @see #MODE_WORLD_READABLE

     * @see #MODE_WORLD_WRITEABLE

     */

    public abstract SharedPreferences getSharedPreferences(String name,

            int mode);

    public abstract SharedPreferences getSharedPreferences(String name, int mode);



    /**

     * Retrieve and hold the contents of the preferences file, returning

     * a SharedPreferences through which you can retrieve and modify its

     * values.  Only one instance of the SharedPreferences object is returned

     * to any callers for the same name, meaning they will see each other's

     * edits as soon as they are made.

     *

     * @param file Desired preferences file. If a preferences file by this name

     * does not exist, it will be created when you retrieve an

     * editor (SharedPreferences.edit()) and then commit changes (Editor.commit()).

     * @param mode Operating mode.  Use 0 or {@link #MODE_PRIVATE} for the

     * default operation, {@link #MODE_WORLD_READABLE}

     * and {@link #MODE_WORLD_WRITEABLE} to control permissions.

     *

     * @return The single {@link SharedPreferences} instance that can be used

     *         to retrieve and modify the preference values.

     *

     * @see #MODE_PRIVATE

     * @see #MODE_WORLD_READABLE

     * @see #MODE_WORLD_WRITEABLE

     */

    public abstract SharedPreferences getSharedPreferences(File file, int mode);



    /**

     * Open a private file associated with this Context's application package