Merge "Fix registerSliceCallback to match api guidelines" (4953824b) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −3

Original line number	Diff line number	Diff line
		@@ -7182,9 +7182,10 @@ package android.app.slice {
		method public java.util.List<android.app.slice.SliceSpec> getPinnedSpecs(android.net.Uri);
		method public java.util.Collection<android.net.Uri> getSliceDescendants(android.net.Uri);
		method public void pinSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);
		method public void registerSliceCallback(android.net.Uri, android.app.slice.SliceManager.SliceCallback, java.util.List<android.app.slice.SliceSpec>);
		method public void registerSliceCallback(android.net.Uri, android.app.slice.SliceManager.SliceCallback, java.util.List<android.app.slice.SliceSpec>, android.os.Handler);
		method public void registerSliceCallback(android.net.Uri, android.app.slice.SliceManager.SliceCallback, java.util.List<android.app.slice.SliceSpec>, java.util.concurrent.Executor);
		method public deprecated void registerSliceCallback(android.net.Uri, android.app.slice.SliceManager.SliceCallback, java.util.List<android.app.slice.SliceSpec>);
		method public deprecated void registerSliceCallback(android.net.Uri, android.app.slice.SliceManager.SliceCallback, java.util.List<android.app.slice.SliceSpec>, java.util.concurrent.Executor);
		method public void registerSliceCallback(android.net.Uri, java.util.List<android.app.slice.SliceSpec>, android.app.slice.SliceManager.SliceCallback);
		method public void registerSliceCallback(android.net.Uri, java.util.List<android.app.slice.SliceSpec>, java.util.concurrent.Executor, android.app.slice.SliceManager.SliceCallback);
		method public void unpinSlice(android.net.Uri);
		method public void unregisterSliceCallback(android.net.Uri, android.app.slice.SliceManager.SliceCallback);
		}

core/java/android/app/slice/SliceManager.java

+18 −27

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.app.slice;

		import android.annotation.CallbackExecutor;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemService;
		@@ -90,21 +91,21 @@ public class SliceManager {
		}

		/**
		* Adds a callback to a specific slice uri.
		* <p>
		* This is a convenience that performs a few slice actions at once. It will put
		* the slice in a pinned state since there is a callback attached. It will also
		* listen for content changes, when a content change observes, the android system
		* will bind the new slice and provide it to all registered {@link SliceCallback}s.
		*
		* @param uri The uri of the slice being listened to.
		* @param callback The listener that should receive the callbacks.
		* @param specs The list of supported {@link SliceSpec}s of the callback.
		* @see SliceProvider#onSlicePinned(Uri)
		* @deprecated TO BE REMOVED.
		*/
		@Deprecated
		public void registerSliceCallback(@NonNull Uri uri, @NonNull SliceCallback callback,
		@NonNull List<SliceSpec> specs) {
		registerSliceCallback(uri, callback, specs, Handler.getMain());
		registerSliceCallback(uri, specs, mContext.getMainExecutor(), callback);
		}

		/**
		* @deprecated TO BE REMOVED.
		*/
		@Deprecated
		public void registerSliceCallback(@NonNull Uri uri, @NonNull SliceCallback callback,
		@NonNull List<SliceSpec> specs, Executor executor) {
		registerSliceCallback(uri, specs, executor, callback);
		}

		/**
		@@ -120,19 +121,9 @@ public class SliceManager {
		* @param specs The list of supported {@link SliceSpec}s of the callback.
		* @see SliceProvider#onSlicePinned(Uri)
		*/
		public void registerSliceCallback(@NonNull Uri uri, @NonNull SliceCallback callback,
		@NonNull List<SliceSpec> specs, Handler handler) {
		try {
		mService.addSliceListener(uri, mContext.getPackageName(),
		getListener(uri, callback, new ISliceListener.Stub() {
		@Override
		public void onSliceUpdated(Slice s) throws RemoteException {
		handler.post(() -> callback.onSliceUpdated(s));
		}
		}), specs.toArray(new SliceSpec[specs.size()]));
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		public void registerSliceCallback(@NonNull Uri uri, @NonNull List<SliceSpec> specs,
		@NonNull SliceCallback callback) {
		registerSliceCallback(uri, specs, mContext.getMainExecutor(), callback);
		}

		/**
		@@ -148,8 +139,8 @@ public class SliceManager {
		* @param specs The list of supported {@link SliceSpec}s of the callback.
		* @see SliceProvider#onSlicePinned(Uri)
		*/
		public void registerSliceCallback(@NonNull Uri uri, @NonNull SliceCallback callback,
		@NonNull List<SliceSpec> specs, Executor executor) {
		public void registerSliceCallback(@NonNull Uri uri, @NonNull List<SliceSpec> specs,
		@NonNull @CallbackExecutor Executor executor, @NonNull SliceCallback callback) {
		try {
		mService.addSliceListener(uri, mContext.getPackageName(),
		getListener(uri, callback, new ISliceListener.Stub() {