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

Commit 53a441ca authored by Svet Ganov's avatar Svet Ganov Committed by Svetoslav Ganov
Browse files

Ensure local settings caches are not stale 

We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
parent 5a91b615

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/net/Uri.aidl \

	frameworks/base/core/java/android/net/NetworkRequest.aidl \

	frameworks/base/core/java/android/net/LinkAddress.aidl \

	frameworks/base/core/java/android/util/MemoryIntArray.aidl \

	frameworks/base/core/java/android/view/Display.aidl \

	frameworks/base/core/java/android/view/InputDevice.aidl \

	frameworks/base/core/java/android/view/InputEvent.aidl \

api/current.txt

+0 −3
Original line number Diff line number Diff line
@@ -32486,7 +32486,6 @@ package android.provider { 
    field public static final java.lang.String RADIO_WIFI = "wifi";

    field public static final java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";

    field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";

    field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";

    field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
@@ -32567,7 +32566,6 @@ package android.provider { 
    field public static final java.lang.String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";

    field public static final java.lang.String SETTINGS_CLASSNAME = "settings_classname";

    field public static final java.lang.String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_secure_version";

    field public static final java.lang.String TOUCH_EXPLORATION_ENABLED = "touch_exploration_enabled";

    field public static final deprecated java.lang.String TTS_DEFAULT_COUNTRY = "tts_default_country";

    field public static final deprecated java.lang.String TTS_DEFAULT_LANG = "tts_default_lang";
@@ -32682,7 +32680,6 @@ package android.provider { 
    field public static final deprecated java.lang.String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";

    field public static final java.lang.String SOUND_EFFECTS_ENABLED = "sound_effects_enabled";

    field public static final deprecated java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_system_version";

    field public static final java.lang.String TEXT_AUTO_CAPS = "auto_caps";

    field public static final java.lang.String TEXT_AUTO_PUNCTUATE = "auto_punctuate";

    field public static final java.lang.String TEXT_AUTO_REPLACE = "auto_replace";

api/system-current.txt

+0 −3
Original line number Diff line number Diff line
@@ -35143,7 +35143,6 @@ package android.provider { 
    field public static final java.lang.String RADIO_WIFI = "wifi";

    field public static final java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";

    field public static final java.lang.String THEATER_MODE_ON = "theater_mode_on";

    field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";

    field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
@@ -35226,7 +35225,6 @@ package android.provider { 
    field public static final java.lang.String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";

    field public static final java.lang.String SETTINGS_CLASSNAME = "settings_classname";

    field public static final java.lang.String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_secure_version";

    field public static final java.lang.String TOUCH_EXPLORATION_ENABLED = "touch_exploration_enabled";

    field public static final deprecated java.lang.String TTS_DEFAULT_COUNTRY = "tts_default_country";

    field public static final deprecated java.lang.String TTS_DEFAULT_LANG = "tts_default_lang";
@@ -35341,7 +35339,6 @@ package android.provider { 
    field public static final deprecated java.lang.String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";

    field public static final java.lang.String SOUND_EFFECTS_ENABLED = "sound_effects_enabled";

    field public static final deprecated java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_system_version";

    field public static final java.lang.String TEXT_AUTO_CAPS = "auto_caps";

    field public static final java.lang.String TEXT_AUTO_PUNCTUATE = "auto_punctuate";

    field public static final java.lang.String TEXT_AUTO_REPLACE = "auto_replace";

api/test-current.txt

+0 −3
Original line number Diff line number Diff line
@@ -32558,7 +32558,6 @@ package android.provider { 
    field public static final java.lang.String RADIO_WIFI = "wifi";

    field public static final java.lang.String SHOW_PROCESSES = "show_processes";

    field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";

    field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";

    field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";

    field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
@@ -32639,7 +32638,6 @@ package android.provider { 
    field public static final java.lang.String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";

    field public static final java.lang.String SETTINGS_CLASSNAME = "settings_classname";

    field public static final java.lang.String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_secure_version";

    field public static final java.lang.String TOUCH_EXPLORATION_ENABLED = "touch_exploration_enabled";

    field public static final deprecated java.lang.String TTS_DEFAULT_COUNTRY = "tts_default_country";

    field public static final deprecated java.lang.String TTS_DEFAULT_LANG = "tts_default_lang";
@@ -32755,7 +32753,6 @@ package android.provider { 
    field public static final deprecated java.lang.String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";

    field public static final java.lang.String SOUND_EFFECTS_ENABLED = "sound_effects_enabled";

    field public static final deprecated java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_system_version";

    field public static final java.lang.String TEXT_AUTO_CAPS = "auto_caps";

    field public static final java.lang.String TEXT_AUTO_PUNCTUATE = "auto_punctuate";

    field public static final java.lang.String TEXT_AUTO_REPLACE = "auto_replace";

core/java/android/provider/Settings.java

+106 −30
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.provider;



import android.annotation.NonNull;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;
@@ -50,7 +51,6 @@ import android.os.IBinder; 
import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.Build.VERSION_CODES;

import android.speech.tts.TextToSpeech;
@@ -61,9 +61,12 @@ import android.util.ArraySet; 
import android.util.LocaleList;

import android.util.Log;



import android.util.MemoryIntArray;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.ArrayUtils;

import com.android.internal.widget.ILockSettings;



import java.io.IOException;

import java.net.URISyntaxException;

import java.text.SimpleDateFormat;

import java.util.HashMap;
@@ -1281,6 +1284,29 @@ public final class Settings { 
     */

    public static final String CALL_METHOD_GET_GLOBAL = "GET_global";



    /**

     * @hide - Specifies that the caller of the fast-path call()-based flow tracks

     * the settings generation in order to cache values locally. If this key is

     * mapped to a <code>null</code> string extra in the request bundle, the response

     * bundle will contain the same key mapped to a parcelable extra which would be

     * an {@link android.util.MemoryIntArray}. The response will also contain an

     * integer mapped to the {@link #CALL_METHOD_GENERATION_INDEX_KEY} which is the

     * index in the array clients should use to lookup the generation. For efficiency

     * the caller should request the generation tracking memory array only if it

     * doesn't already have it.

     *

     * @see #CALL_METHOD_GENERATION_INDEX_KEY

     */

    public static final String CALL_METHOD_TRACK_GENERATION_KEY = "_track_generation";



    /**

     * @hide Key with the location in the {@link android.util.MemoryIntArray} where

     * to look up the generation id of the backing table.

     *

     * @see #CALL_METHOD_TRACK_GENERATION_KEY

     */

    public static final String CALL_METHOD_GENERATION_INDEX_KEY = "_generation_index";



    /**

     * @hide - User handle argument extra to the fast-path call()-based requests

     */
@@ -1424,9 +1450,42 @@ public final class Settings { 
        }

    }



    private static final class GenerationTracker {

        private final MemoryIntArray mArray;

        private final int mIndex;

        private int mCurrentGeneration;



        public GenerationTracker(@NonNull MemoryIntArray array, int index) {

            mArray = array;

            mIndex = index;

            mCurrentGeneration = readCurrentGeneration();

        }



        public boolean isGenerationChanged() {

            final int currentGeneration = readCurrentGeneration();

            if (currentGeneration >= 0) {

                if (currentGeneration == mCurrentGeneration) {

                    return false;

                }

                mCurrentGeneration = currentGeneration;

            }

            return true;

        }



        private int readCurrentGeneration() {

            try {

                return mArray.get(mIndex);

            } catch (IOException e) {

                Log.e(TAG, "Error getting current generation", e);

            }

            return -1;

        }

    }



    // Thread-safe.

    private static class NameValueCache {

        private final String mVersionSystemProperty;

        private static final boolean DEBUG = false;



        private final Uri mUri;



        private static final String[] SELECT_VALUE =
@@ -1435,7 +1494,6 @@ public final class Settings { 


        // Must synchronize on 'this' to access mValues and mValuesVersion.

        private final HashMap<String, String> mValues = new HashMap<String, String>();

        private long mValuesVersion = 0;



        // Initially null; set lazily and held forever.  Synchronized on 'this'.

        private IContentProvider mContentProvider = null;
@@ -1445,9 +1503,10 @@ public final class Settings { 
        private final String mCallGetCommand;

        private final String mCallSetCommand;



        public NameValueCache(String versionSystemProperty, Uri uri,

                String getCommand, String setCommand) {

            mVersionSystemProperty = versionSystemProperty;

        @GuardedBy("this")

        private GenerationTracker mGenerationTracker;



        public NameValueCache(Uri uri, String getCommand, String setCommand) {

            mUri = uri;

            mCallGetCommand = getCommand;

            mCallSetCommand = setCommand;
@@ -1482,22 +1541,18 @@ public final class Settings { 
        public String getStringForUser(ContentResolver cr, String name, final int userHandle) {

            final boolean isSelf = (userHandle == UserHandle.myUserId());

            if (isSelf) {

                long newValuesVersion = SystemProperties.getLong(mVersionSystemProperty, 0);



                // Our own user's settings data uses a client-side cache

                synchronized (this) {

                    if (mValuesVersion != newValuesVersion) {

                        if (LOCAL_LOGV || false) {

                            Log.v(TAG, "invalidate [" + mUri.getLastPathSegment() + "]: current "

                                    + newValuesVersion + " != cached " + mValuesVersion);

                    if (mGenerationTracker != null) {

                        if (mGenerationTracker.isGenerationChanged()) {

                            if (DEBUG) {

                                Log.i(TAG, "Generation changed for type:"

                                        + mUri.getPath() + " in package:"

                                        + cr.getPackageName() +" and user:" + userHandle);

                            }



                            mValues.clear();

                        mValuesVersion = newValuesVersion;

                        } else if (mValues.containsKey(name)) {

                            return mValues.get(name);

                        }



                    if (mValues.containsKey(name)) {

                        return mValues.get(name);  // Could be null, that's OK -- negative caching

                    }

                }

            } else {
@@ -1518,12 +1573,42 @@ public final class Settings { 
                        args = new Bundle();

                        args.putInt(CALL_METHOD_USER_KEY, userHandle);

                    }

                    boolean needsGenerationTracker = false;

                    synchronized (this) {

                        if (isSelf && mGenerationTracker == null) {

                            needsGenerationTracker = true;

                            if (args == null) {

                                args = new Bundle();

                            }

                            args.putString(CALL_METHOD_TRACK_GENERATION_KEY, null);

                            if (DEBUG) {

                                Log.i(TAG, "Requested generation tracker for type: "+ mUri.getPath()

                                        + " in package:" + cr.getPackageName() +" and user:"

                                        + userHandle);

                            }

                        }

                    }

                    Bundle b = cp.call(cr.getPackageName(), mCallGetCommand, name, args);

                    if (b != null) {

                        String value = b.getPairValue();

                        String value = b.getString(Settings.NameValueTable.VALUE);

                        // Don't update our cache for reads of other users' data

                        if (isSelf) {

                            synchronized (this) {

                                if (needsGenerationTracker) {

                                    MemoryIntArray array = b.getParcelable(

                                            CALL_METHOD_TRACK_GENERATION_KEY);

                                    final int index = b.getInt(

                                            CALL_METHOD_GENERATION_INDEX_KEY, -1);

                                    if (array != null && index >= 0) {

                                        if (DEBUG) {

                                            Log.i(TAG, "Received generation tracker for type:"

                                                    + mUri.getPath() + " in package:"

                                                    + cr.getPackageName() + " and user:"

                                                    + userHandle + " with index:" + index);

                                        }

                                        mGenerationTracker = new GenerationTracker(array, index);

                                    }

                                }

                                mValues.put(name, value);

                            }

                        } else {
@@ -1592,8 +1677,6 @@ public final class Settings { 
     * functions for accessing individual settings entries.

     */

    public static final class System extends NameValueTable {

        public static final String SYS_PROP_SETTING_VERSION = "sys.settings_system_version";



        private static final float DEFAULT_FONT_SCALE = 1.0f;



        /** @hide */
@@ -1608,7 +1691,6 @@ public final class Settings { 
            Uri.parse("content://" + AUTHORITY + "/system");



        private static final NameValueCache sNameValueCache = new NameValueCache(

                SYS_PROP_SETTING_VERSION,

                CONTENT_URI,

                CALL_METHOD_GET_SYSTEM,

                CALL_METHOD_PUT_SYSTEM);
@@ -3913,8 +3995,6 @@ public final class Settings { 
     * APIs for those values, not modified directly by applications.

     */

    public static final class Secure extends NameValueTable {

        public static final String SYS_PROP_SETTING_VERSION = "sys.settings_secure_version";



        /**

         * The content:// style URL for this table

         */
@@ -3923,7 +4003,6 @@ public final class Settings { 


        // Populated lazily, guarded by class object:

        private static final NameValueCache sNameValueCache = new NameValueCache(

                SYS_PROP_SETTING_VERSION,

                CONTENT_URI,

                CALL_METHOD_GET_SECURE,

                CALL_METHOD_PUT_SECURE);
@@ -6357,8 +6436,6 @@ public final class Settings { 
     * explicitly modify through the system UI or specialized APIs for those values.

     */

    public static final class Global extends NameValueTable {

        public static final String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";



        /**

         * The content:// style URL for global secure settings items.  Not public.

         */
@@ -8409,7 +8486,6 @@ public final class Settings { 


        // Populated lazily, guarded by class object:

        private static NameValueCache sNameValueCache = new NameValueCache(

                    SYS_PROP_SETTING_VERSION,

                    CONTENT_URI,

                    CALL_METHOD_GET_GLOBAL,

                    CALL_METHOD_PUT_GLOBAL);