Merge "Rename ProximityCallback to ProximityUpdateCallback" (b524be69) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -10848,7 +10848,7 @@ package android.service.attention {
		method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method public abstract void onCancelAttentionCheck(@NonNull android.service.attention.AttentionService.AttentionCallback);
		method public abstract void onCheckAttention(@NonNull android.service.attention.AttentionService.AttentionCallback);
		method public void onStartProximityUpdates(@NonNull android.service.attention.AttentionService.ProximityCallback);
		method public void onStartProximityUpdates(@NonNull android.service.attention.AttentionService.ProximityUpdateCallback);
		method public void onStopProximityUpdates();
		field public static final int ATTENTION_FAILURE_CAMERA_PERMISSION_ABSENT = 6; // 0x6
		field public static final int ATTENTION_FAILURE_CANCELLED = 3; // 0x3
		@@ -10866,7 +10866,7 @@ package android.service.attention {
		method public void onSuccess(int, long);
		}

		public static final class AttentionService.ProximityCallback {
		public static final class AttentionService.ProximityUpdateCallback {
		method public void onProximityUpdate(double);
		}

core/java/android/attention/AttentionManagerInternal.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -49,21 +49,19 @@ public abstract class AttentionManagerInternal {
		/**
		* Requests the continuous updates of proximity signal via the provided callback,
		* until the given callback is unregistered. Currently, AttentionManagerService only
		* anticipates one client and updates one client at a time. If a new client wants to
		* onboard to receiving Proximity updates, please make a feature request to make proximity
		* feature multi-client before depending on this feature.
		* anticipates one client and updates one client at a time.
		*
		* @param callback a callback that receives the proximity updates
		* @return {@code true} if the registration should succeed.
		*/
		public abstract boolean onStartProximityUpdates(ProximityCallbackInternal callback);
		public abstract boolean onStartProximityUpdates(ProximityUpdateCallbackInternal callback);

		/**
		* Requests to stop providing continuous updates until the callback is registered.
		*
		* @param callback a callback that was used in {@link #onStartProximityUpdates}
		*/
		public abstract void onStopProximityUpdates(ProximityCallbackInternal callback);
		public abstract void onStopProximityUpdates(ProximityUpdateCallbackInternal callback);

		/** Internal interface for attention callback. */
		public abstract static class AttentionCallbackInternal {
		@@ -85,7 +83,7 @@ public abstract class AttentionManagerInternal {
		}

		/** Internal interface for proximity callback. */
		public abstract static class ProximityCallbackInternal {
		public abstract static class ProximityUpdateCallbackInternal {
		/**
		* @param distance the estimated distance of the user (in meter)
		* The distance will be PROXIMITY_UNKNOWN if the proximity sensing was inconclusive.

core/java/android/service/attention/AttentionService.java

+13 −11

Original line number	Diff line number	Diff line
		@@ -128,9 +128,9 @@ public abstract class AttentionService extends Service {

		/** {@inheritDoc} */
		@Override
		public void onStartProximityUpdates(IProximityCallback callback) {
		public void onStartProximityUpdates(IProximityUpdateCallback callback) {
		Objects.requireNonNull(callback);
		AttentionService.this.onStartProximityUpdates(new ProximityCallback(callback));
		AttentionService.this.onStartProximityUpdates(new ProximityUpdateCallback(callback));

		}

		@@ -166,11 +166,11 @@ public abstract class AttentionService extends Service {

		/**
		* Requests the continuous updates of proximity signal via the provided callback,
		* until the given callback is unregistered.
		* until {@link #onStopProximityUpdates} is called.
		*
		* @param callback the callback to return the result to
		*/
		public void onStartProximityUpdates(@NonNull ProximityCallback callback) {
		public void onStartProximityUpdates(@NonNull ProximityUpdateCallback callback) {
		Slog.w(LOG_TAG, "Override this method.");
		}

		@@ -213,22 +213,24 @@ public abstract class AttentionService extends Service {
		}
		}

		/** Callbacks for ProximityCallback results. */
		public static final class ProximityCallback {
		@NonNull private final WeakReference<IProximityCallback> mCallback;
		/** Callbacks for ProximityUpdateCallback results. */
		public static final class ProximityUpdateCallback {
		@NonNull private final WeakReference<IProximityUpdateCallback> mCallback;

		private ProximityCallback(@NonNull IProximityCallback callback) {
		private ProximityUpdateCallback(@NonNull IProximityUpdateCallback callback) {
		mCallback = new WeakReference<>(callback);
		}

		/**
		* @param distance the estimated distance of the user (in meter)
		* The distance will be PROXIMITY_UNKNOWN if the proximity sensing was inconclusive.
		*
		* The distance will be {@link #PROXIMITY_UNKNOWN} if the proximity sensing
		* was inconclusive.
		*/
		public void onProximityUpdate(double distance) {
		try {
		if (mCallback.get() != null) {
		mCallback.get().onProximityUpdate(distance);
		}
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}

core/java/android/service/attention/IAttentionService.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package android.service.attention;

		import android.service.attention.IAttentionCallback;
		import android.service.attention.IProximityCallback;
		import android.service.attention.IProximityUpdateCallback;

		/**
		* Interface for a concrete implementation to provide to the AttentionManagerService.
		@@ -27,6 +27,6 @@ import android.service.attention.IProximityCallback;
		oneway interface IAttentionService {
		void checkAttention(IAttentionCallback callback);
		void cancelAttentionCheck(IAttentionCallback callback);
		void onStartProximityUpdates(IProximityCallback callback);
		void onStartProximityUpdates(IProximityUpdateCallback callback);
		void onStopProximityUpdates();
		}
		No newline at end of file

core/java/android/service/attention/IProximityCallback.aidl→core/java/android/service/attention/IProximityUpdateCallback.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,6 @@ package android.service.attention;
		*
		* @hide
		*/
		oneway interface IProximityCallback {
		oneway interface IProximityUpdateCallback {
		void onProximityUpdate(double distance);
		}