am d990e411: am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev (ec8b095c) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7759,7 +7759,7 @@ package android.content {
	field public static final java.lang.String MIDI_SERVICE = "midi";		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_APPEND = 32768; // 0x8000
	field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8		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 int MODE_PRIVATE = 0; // 0x0
	field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1		field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1
	field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2		field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2

api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7976,7 +7976,7 @@ package android.content {
	field public static final java.lang.String MIDI_SERVICE = "midi";		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_APPEND = 32768; // 0x8000
	field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8		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 int MODE_PRIVATE = 0; // 0x0
	field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1		field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1
	field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2		field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2

core/java/android/content/Context.java

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,15 @@ public abstract class Context {
	* explicitly set if desired.		* explicitly set if desired.
	*		*
	* @see #getSharedPreferences		* @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;		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()).		* editor (SharedPreferences.edit()) and then commit changes (Editor.commit()).
	* @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the		* @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
	* default operation, {@link #MODE_WORLD_READABLE}		* default operation, {@link #MODE_WORLD_READABLE}
	* and {@link #MODE_WORLD_WRITEABLE} to control permissions. The bit		* and {@link #MODE_WORLD_WRITEABLE} to control permissions.
	* {@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.
	*		*
	* @return The single {@link SharedPreferences} instance that can be used		* @return The single {@link SharedPreferences} instance that can be used
	* to retrieve and modify the preference values.		* to retrieve and modify the preference values.
	@@ -616,7 +620,6 @@ public abstract class Context {
	* @see #MODE_PRIVATE		* @see #MODE_PRIVATE
	* @see #MODE_WORLD_READABLE		* @see #MODE_WORLD_READABLE
	* @see #MODE_WORLD_WRITEABLE		* @see #MODE_WORLD_WRITEABLE
	* @see #MODE_MULTI_PROCESS
	*/		*/
	public abstract SharedPreferences getSharedPreferences(String name,		public abstract SharedPreferences getSharedPreferences(String name,
	int mode);		int mode);