Merge "Give hidden API behavior to legacy apps." into rvc-dev (a7a96ad6) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

api/removed.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -69,6 +69,10 @@ package android.app.usage {

	package android.content {		package android.content {

			public abstract class ContentResolver {
			method @Deprecated public void notifyChange(@NonNull Iterable<android.net.Uri>, @Nullable android.database.ContentObserver, int);
			}

	public abstract class Context {		public abstract class Context {
	method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);		method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
	method public abstract java.io.File getSharedPreferencesPath(String);		method public abstract java.io.File getSharedPreferencesPath(String);

core/java/android/content/ContentResolver.java

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -83,6 +83,7 @@ import java.io.OutputStream;
	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	import java.util.ArrayList;		import java.util.ArrayList;
			import java.util.Collection;
	import java.util.List;		import java.util.List;
	import java.util.Objects;		import java.util.Objects;
	import java.util.Random;		import java.util.Random;
	@@ -2670,6 +2671,15 @@ public abstract class ContentResolver implements ContentInterface {
	ContentProvider.getUserIdFromUri(uri, mContext.getUserId()));		ContentProvider.getUserIdFromUri(uri, mContext.getUserId()));
	}		}

			/** @removed */
			@Deprecated
			public void notifyChange(@NonNull Iterable<Uri> uris, @Nullable ContentObserver observer,
			@NotifyFlags int flags) {
			final Collection<Uri> asCollection = new ArrayList<>();
			uris.forEach(asCollection::add);
			notifyChange(asCollection, observer, flags);
			}

	/**		/**
	* Notify registered observers that several rows have been updated.		* Notify registered observers that several rows have been updated.
	* <p>		* <p>
	@@ -2694,7 +2704,7 @@ public abstract class ContentResolver implements ContentInterface {
	* @param flags Flags such as {@link #NOTIFY_SYNC_TO_NETWORK} or		* @param flags Flags such as {@link #NOTIFY_SYNC_TO_NETWORK} or
	* {@link #NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS}.		* {@link #NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS}.
	*/		*/
	public void notifyChange(@NonNull Iterable<Uri> uris, @Nullable ContentObserver observer,		public void notifyChange(@NonNull Collection<Uri> uris, @Nullable ContentObserver observer,
	@NotifyFlags int flags) {		@NotifyFlags int flags) {
	Objects.requireNonNull(uris, "uris");		Objects.requireNonNull(uris, "uris");

core/java/android/database/ContentObserver.java

+36 −9

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,9 @@ package android.database;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.UserIdInt;		import android.annotation.UserIdInt;
			import android.app.compat.CompatChanges;
			import android.compat.annotation.ChangeId;
			import android.compat.annotation.EnabledAfter;
	import android.compat.annotation.UnsupportedAppUsage;		import android.compat.annotation.UnsupportedAppUsage;
	import android.content.ContentResolver.NotifyFlags;		import android.content.ContentResolver.NotifyFlags;
	import android.net.Uri;		import android.net.Uri;
	@@ -26,12 +29,26 @@ import android.os.Handler;
	import android.os.UserHandle;		import android.os.UserHandle;

	import java.util.Arrays;		import java.util.Arrays;
			import java.util.Collection;

	/**		/**
	* Receives call backs for changes to content.		* Receives call backs for changes to content.
	* Must be implemented by objects which are added to a {@link ContentObservable}.		* Must be implemented by objects which are added to a {@link ContentObservable}.
	*/		*/
	public abstract class ContentObserver {		public abstract class ContentObserver {
			/**
			* Starting in {@link android.os.Build.VERSION_CODES#R}, there is a new
			* public API overload {@link #onChange(boolean, Uri, int)} that delivers a
			* {@code int flags} argument.
			* <p>
			* Some apps may be relying on a previous hidden API that delivered a
			* {@code int userId} argument, and this change is used to control delivery
			* of the new {@code int flags} argument in its place.
			*/
			@ChangeId
			@EnabledAfter(targetSdkVersion=android.os.Build.VERSION_CODES.Q)
			private static final long ADD_CONTENT_OBSERVER_FLAGS = 150939131L;

	private final Object mLock = new Object();		private final Object mLock = new Object();
	private Transport mTransport; // guarded by mLock		private Transport mTransport; // guarded by mLock

	@@ -164,17 +181,27 @@ public abstract class ContentObserver {
	* @param uris The Uris of the changed content.		* @param uris The Uris of the changed content.
	* @param flags Flags indicating details about this change.		* @param flags Flags indicating details about this change.
	*/		*/
	public void onChange(boolean selfChange, @NonNull Iterable<Uri> uris, @NotifyFlags int flags) {		public void onChange(boolean selfChange, @NonNull Collection<Uri> uris,
			@NotifyFlags int flags) {
	for (Uri uri : uris) {		for (Uri uri : uris) {
	onChange(selfChange, uri, flags);		onChange(selfChange, uri, flags);
	}		}
	}		}

	/** @hide */		/** @hide */
	public void onChange(boolean selfChange, @NonNull Iterable<Uri> uris, @NotifyFlags int flags,		public void onChange(boolean selfChange, @NonNull Collection<Uri> uris,
	@UserIdInt int userId) {		@NotifyFlags int flags, @UserIdInt int userId) {
			// There are dozens of people relying on the hidden API inside the
			// system UID, so hard-code the old behavior for all of them; for
			// everyone else we gate based on a specific change
			if (!CompatChanges.isChangeEnabled(ADD_CONTENT_OBSERVER_FLAGS)
			\|\| android.os.Process.myUid() == android.os.Process.SYSTEM_UID) {
			// Deliver userId through argument to preserve hidden API behavior
			onChange(selfChange, uris, userId);
			} else {
	onChange(selfChange, uris, flags);		onChange(selfChange, uris, flags);
	}		}
			}

	/**		/**
	* Dispatches a change notification to the observer.		* Dispatches a change notification to the observer.
	@@ -186,7 +213,7 @@ public abstract class ContentObserver {
	*		*
	* @deprecated Callers should migrate towards using a richer overload that		* @deprecated Callers should migrate towards using a richer overload that
	* provides more details about the change, such as		* provides more details about the change, such as
	* {@link #dispatchChange(boolean, Iterable, int)}.		* {@link #dispatchChange(boolean, Collection, int)}.
	*/		*/
	@Deprecated		@Deprecated
	public final void dispatchChange(boolean selfChange) {		public final void dispatchChange(boolean selfChange) {
	@@ -206,7 +233,7 @@ public abstract class ContentObserver {
	* @param uri The Uri of the changed content.		* @param uri The Uri of the changed content.
	*/		*/
	public final void dispatchChange(boolean selfChange, @Nullable Uri uri) {		public final void dispatchChange(boolean selfChange, @Nullable Uri uri) {
	dispatchChange(selfChange, Arrays.asList(uri), 0, UserHandle.getCallingUserId());		dispatchChange(selfChange, uri, 0);
	}		}

	/**		/**
	@@ -224,7 +251,7 @@ public abstract class ContentObserver {
	*/		*/
	public final void dispatchChange(boolean selfChange, @Nullable Uri uri,		public final void dispatchChange(boolean selfChange, @Nullable Uri uri,
	@NotifyFlags int flags) {		@NotifyFlags int flags) {
	dispatchChange(selfChange, Arrays.asList(uri), flags, UserHandle.getCallingUserId());		dispatchChange(selfChange, Arrays.asList(uri), flags);
	}		}

	/**		/**
	@@ -240,13 +267,13 @@ public abstract class ContentObserver {
	* @param uris The Uri of the changed content.		* @param uris The Uri of the changed content.
	* @param flags Flags indicating details about this change.		* @param flags Flags indicating details about this change.
	*/		*/
	public final void dispatchChange(boolean selfChange, @NonNull Iterable<Uri> uris,		public final void dispatchChange(boolean selfChange, @NonNull Collection<Uri> uris,
	@NotifyFlags int flags) {		@NotifyFlags int flags) {
	dispatchChange(selfChange, uris, flags, UserHandle.getCallingUserId());		dispatchChange(selfChange, uris, flags, UserHandle.getCallingUserId());
	}		}

	/** @hide */		/** @hide */
	public final void dispatchChange(boolean selfChange, @NonNull Iterable<Uri> uris,		public final void dispatchChange(boolean selfChange, @NonNull Collection<Uri> uris,
	@NotifyFlags int flags, @UserIdInt int userId) {		@NotifyFlags int flags, @UserIdInt int userId) {
	if (mHandler == null) {		if (mHandler == null) {
	onChange(selfChange, uris, flags, userId);		onChange(selfChange, uris, flags, userId);

core/java/android/database/CursorToBulkCursorAdaptor.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -20,10 +20,12 @@ import android.annotation.NonNull;
	import android.annotation.UserIdInt;		import android.annotation.UserIdInt;
	import android.content.ContentResolver.NotifyFlags;		import android.content.ContentResolver.NotifyFlags;
	import android.net.Uri;		import android.net.Uri;
	import android.os.*;		import android.os.Bundle;
			import android.os.IBinder;
			import android.os.RemoteException;

	import java.util.ArrayList;		import java.util.ArrayList;
			import java.util.Collection;

	/**		/**
	* Wraps a BulkCursor around an existing Cursor making it remotable.		* Wraps a BulkCursor around an existing Cursor making it remotable.
	@@ -81,7 +83,7 @@ public final class CursorToBulkCursorAdaptor extends BulkCursorNative
	}		}

	@Override		@Override
	public void onChange(boolean selfChange, @NonNull Iterable<Uri> uris,		public void onChange(boolean selfChange, @NonNull Collection<Uri> uris,
	@NotifyFlags int flags, @UserIdInt int userId) {		@NotifyFlags int flags, @UserIdInt int userId) {
	// Since we deliver changes from the most-specific to least-specific		// Since we deliver changes from the most-specific to least-specific
	// overloads, we only need to redirect from the most-specific local		// overloads, we only need to redirect from the most-specific local