diff options
| author | Christopher Tate <ctate@google.com> | 2015-05-12 17:28:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 17:28:28 +0000 |
| commit | 54415439ca8d286c4efaf975a54fe0cc7872c86b (patch) | |
| tree | 9233579d24f81e9d653621297c92a668965e8425 | |
| parent | d2c05188b669256ab9d6024ad5793e0ca891fed0 (diff) | |
| parent | d5748b8facbc94d9c3b43f79bd49a1bbe8a0b6a0 (diff) | |
| download | frameworks_base-54415439ca8d286c4efaf975a54fe0cc7872c86b.zip frameworks_base-54415439ca8d286c4efaf975a54fe0cc7872c86b.tar.gz frameworks_base-54415439ca8d286c4efaf975a54fe0cc7872c86b.tar.bz2 | |
Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 15 |
3 files changed, 11 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index c307199..45e3c8a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7759,7 +7759,7 @@ package android.content { field public static final java.lang.String MIDI_SERVICE = "midi"; field public static final int MODE_APPEND = 32768; // 0x8000 field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8 - field public static final int MODE_MULTI_PROCESS = 4; // 0x4 + field public static final deprecated int MODE_MULTI_PROCESS = 4; // 0x4 field public static final int MODE_PRIVATE = 0; // 0x0 field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1 field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2 diff --git a/api/system-current.txt b/api/system-current.txt index 57b4c6c..32eaeed 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7976,7 +7976,7 @@ package android.content { field public static final java.lang.String MIDI_SERVICE = "midi"; field public static final int MODE_APPEND = 32768; // 0x8000 field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8 - field public static final int MODE_MULTI_PROCESS = 4; // 0x4 + field public static final deprecated int MODE_MULTI_PROCESS = 4; // 0x4 field public static final int MODE_PRIVATE = 0; // 0x0 field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1 field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2 diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 6a98950..a434c7b 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -134,7 +134,15 @@ public abstract class Context { * explicitly set if desired. * * @see #getSharedPreferences + * + * @deprecated MODE_MULTI_PROCESS does not work reliably in + * some versions of Android, and furthermore does not provide any + * mechanism for reconciling concurrent modifications across + * processes. Applications should not attempt to use it. Instead, + * they should use an explicit cross-process data management + * approach such as {@link android.content.ContentProvider ContentProvider}. */ + @Deprecated public static final int MODE_MULTI_PROCESS = 0x0004; /** @@ -604,11 +612,7 @@ public abstract class Context { * 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. The bit - * {@link #MODE_MULTI_PROCESS} can also be used if multiple processes - * are mutating the same SharedPreferences file. {@link #MODE_MULTI_PROCESS} - * is always on in apps targeting Gingerbread (Android 2.3) and below, and - * off by default in later versions. + * 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. @@ -616,7 +620,6 @@ public abstract class Context { * @see #MODE_PRIVATE * @see #MODE_WORLD_READABLE * @see #MODE_WORLD_WRITEABLE - * @see #MODE_MULTI_PROCESS */ public abstract SharedPreferences getSharedPreferences(String name, int mode); |