Merge "Rename provideWearableConnection to provideConnection" into main (0f6369d0) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -3339,9 +3339,9 @@ package android.app.wearable {

		public class WearableSensingManager {
		method @FlaggedApi("android.app.wearable.enable_data_request_observer_api") @Nullable public static android.app.wearable.WearableSensingDataRequest getDataRequestFromIntent(@NonNull android.content.Intent);
		method @FlaggedApi("android.app.wearable.enable_provide_wearable_connection_api") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void provideConnection(@NonNull android.os.ParcelFileDescriptor, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void provideData(@NonNull android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void provideDataStream(@NonNull android.os.ParcelFileDescriptor, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @FlaggedApi("android.app.wearable.enable_provide_wearable_connection_api") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void provideWearableConnection(@NonNull android.os.ParcelFileDescriptor, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @FlaggedApi("android.app.wearable.enable_data_request_observer_api") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void registerDataRequestObserver(int, @NonNull android.app.PendingIntent, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @FlaggedApi("android.app.wearable.enable_hotword_wearable_sensing_api") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void startHotwordRecognition(@Nullable android.content.ComponentName, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @FlaggedApi("android.app.wearable.enable_hotword_wearable_sensing_api") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void stopHotwordRecognition(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		@@ -13765,7 +13765,7 @@ package android.service.wearable {
		method @FlaggedApi("android.app.wearable.enable_data_request_observer_api") @BinderThread public void onDataRequestObserverUnregistered(int, @NonNull String, @NonNull android.service.wearable.WearableSensingDataRequester, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @BinderThread public abstract void onDataStreamProvided(@NonNull android.os.ParcelFileDescriptor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @BinderThread public abstract void onQueryServiceStatus(@NonNull java.util.Set<java.lang.Integer>, @NonNull String, @NonNull java.util.function.Consumer<android.service.ambientcontext.AmbientContextDetectionServiceStatus>);
		method @FlaggedApi("android.app.wearable.enable_provide_wearable_connection_api") @BinderThread public void onSecureWearableConnectionProvided(@NonNull android.os.ParcelFileDescriptor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @FlaggedApi("android.app.wearable.enable_provide_wearable_connection_api") @BinderThread public void onSecureConnectionProvided(@NonNull android.os.ParcelFileDescriptor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @BinderThread public abstract void onStartDetection(@NonNull android.app.ambientcontext.AmbientContextEventRequest, @NonNull String, @NonNull java.util.function.Consumer<android.service.ambientcontext.AmbientContextDetectionServiceStatus>, @NonNull java.util.function.Consumer<android.service.ambientcontext.AmbientContextDetectionResult>);
		method @FlaggedApi("android.app.wearable.enable_hotword_wearable_sensing_api") @BinderThread public void onStartHotwordRecognition(@NonNull java.util.function.Consumer<android.service.voice.HotwordAudioStream>, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method public abstract void onStopDetection(@NonNull String);

core/java/android/app/wearable/IWearableSensingManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import android.os.SharedMemory;
		*/
		interface IWearableSensingManager {
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")
		void provideWearableConnection(in ParcelFileDescriptor parcelFileDescriptor, in RemoteCallback callback);
		void provideConnection(in ParcelFileDescriptor parcelFileDescriptor, in RemoteCallback callback);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")
		void provideDataStream(in ParcelFileDescriptor parcelFileDescriptor, in RemoteCallback callback);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")

core/java/android/app/wearable/WearableSensingManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ public class WearableSensingManager {

		/**
		* The value of the status code that indicates an error occurred in the encrypted channel backed
		* by the provided connection. See {@link #provideWearableConnection(ParcelFileDescriptor,
		* by the provided connection. See {@link #provideConnection(ParcelFileDescriptor,
		* Executor, Consumer)}.
		*/
		@FlaggedApi(Flags.FLAG_ENABLE_PROVIDE_WEARABLE_CONNECTION_API)
		@@ -223,13 +223,13 @@ public class WearableSensingManager {
		*/
		@RequiresPermission(Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)
		@FlaggedApi(Flags.FLAG_ENABLE_PROVIDE_WEARABLE_CONNECTION_API)
		public void provideWearableConnection(
		public void provideConnection(
		@NonNull ParcelFileDescriptor wearableConnection,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull @StatusCode Consumer<Integer> statusConsumer) {
		try {
		RemoteCallback callback = createStatusCallback(executor, statusConsumer);
		mService.provideWearableConnection(wearableConnection, callback);
		mService.provideConnection(wearableConnection, callback);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/service/wearable/IWearableSensingService.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import android.os.SharedMemory;
		* @hide
		*/
		oneway interface IWearableSensingService {
		void provideSecureWearableConnection(in ParcelFileDescriptor parcelFileDescriptor, in RemoteCallback callback);
		void provideSecureConnection(in ParcelFileDescriptor parcelFileDescriptor, in RemoteCallback callback);
		void provideDataStream(in ParcelFileDescriptor parcelFileDescriptor, in RemoteCallback callback);
		void provideData(in PersistableBundle data, in SharedMemory sharedMemory, in RemoteCallback callback);
		void registerDataRequestObserver(int dataType, in RemoteCallback dataRequestCallback, int dataRequestObserverId, in String packageName, in RemoteCallback statusCallback);

core/java/android/service/wearable/WearableSensingService.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -112,11 +112,11 @@ public abstract class WearableSensingService extends Service {
		return new IWearableSensingService.Stub() {
		/** {@inheritDoc} */
		@Override
		public void provideSecureWearableConnection(
		public void provideSecureConnection(
		ParcelFileDescriptor secureWearableConnection, RemoteCallback callback) {
		Objects.requireNonNull(secureWearableConnection);
		Consumer<Integer> consumer = createWearableStatusConsumer(callback);
		WearableSensingService.this.onSecureWearableConnectionProvided(
		WearableSensingService.this.onSecureConnectionProvided(
		secureWearableConnection, consumer);
		}

		@@ -311,12 +311,12 @@ public abstract class WearableSensingService extends Service {

		/**
		* Called when a secure connection to the wearable is available. See {@link
		* WearableSensingManager#provideWearableConnection(ParcelFileDescriptor, Executor, Consumer)}
		* WearableSensingManager#provideConnection(ParcelFileDescriptor, Executor, Consumer)}
		* for details about the secure connection.
		*
		* <p>When the {@code secureWearableConnection} is closed, the system will send a {@link
		* WearableSensingManager#STATUS_CHANNEL_ERROR} status code to the status consumer provided by
		* the caller of {@link WearableSensingManager#provideWearableConnection(ParcelFileDescriptor,
		* the caller of {@link WearableSensingManager#provideConnection(ParcelFileDescriptor,
		* Executor, Consumer)}.
		*
		* <p>The implementing class should override this method. It should return an appropriate status
		@@ -327,7 +327,7 @@ public abstract class WearableSensingService extends Service {
		*/
		@FlaggedApi(Flags.FLAG_ENABLE_PROVIDE_WEARABLE_CONNECTION_API)
		@BinderThread
		public void onSecureWearableConnectionProvided(
		public void onSecureConnectionProvided(
		@NonNull ParcelFileDescriptor secureWearableConnection,
		@NonNull Consumer<Integer> statusConsumer) {
		statusConsumer.accept(WearableSensingManager.STATUS_UNSUPPORTED_OPERATION);