Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3507614a authored by Tom Chan's avatar Tom Chan Committed by Android (Google) Code Review
Browse files

Merge "Deprecate the old provideConnection and related APIs in WSM and WSS" into main

parents b7245a56 c23fbe97

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3435,7 +3435,7 @@ package android.app.wearable { 
  public class WearableSensingManager {

    method @FlaggedApi("android.app.wearable.enable_concurrent_wearable_connections") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public int getAvailableConnectionCount();

    method @Nullable public static android.app.wearable.WearableSensingDataRequest getDataRequestFromIntent(@NonNull android.content.Intent);

    method @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 @Deprecated @FlaggedApi("android.app.wearable.enable_concurrent_wearable_connections") @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 @FlaggedApi("android.app.wearable.enable_concurrent_wearable_connections") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void provideConnection(@NonNull android.app.wearable.WearableConnection, @NonNull java.util.concurrent.Executor);

    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 @Deprecated @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>);
@@ -14551,7 +14551,7 @@ package android.service.wearable { 
    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_read_only_pfd") @BinderThread public void onReadOnlyParcelFileDescriptorProvided(@NonNull android.os.ParcelFileDescriptor, @NonNull android.os.PersistableBundle, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @BinderThread public void onSecureConnectionProvided(@NonNull android.os.ParcelFileDescriptor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @Deprecated @FlaggedApi("android.app.wearable.enable_concurrent_wearable_connections") @BinderThread public void onSecureConnectionProvided(@NonNull android.os.ParcelFileDescriptor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @FlaggedApi("android.app.wearable.enable_concurrent_wearable_connections") @BinderThread public void onSecureConnectionProvided(@NonNull android.os.ParcelFileDescriptor, @NonNull android.os.PersistableBundle, @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>);

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

+4 −0
Original line number Diff line number Diff line
@@ -249,7 +249,11 @@ public class WearableSensingManager { 
     * @param executor Executor on which to run the consumer callback

     * @param statusConsumer A consumer that handles the status codes for providing the connection

     *     and errors in the encrypted channel.

     * @deprecated Use {@link #provideConnection(WearableConnection, Executor)} instead to provide a

     *     remote wearable device connection to the WearableSensingService

     */

    @FlaggedApi(Flags.FLAG_ENABLE_CONCURRENT_WEARABLE_CONNECTIONS)

    @Deprecated

    @RequiresPermission(Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)

    public void provideConnection(

            @NonNull ParcelFileDescriptor wearableConnection,

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

+15 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.app.ambientcontext.AmbientContextEvent; 
import android.app.ambientcontext.AmbientContextEventRequest;

import android.app.wearable.Flags;

import android.app.wearable.IWearableSensingCallback;

import android.app.wearable.WearableConnection;

import android.app.wearable.WearableSensingDataRequest;

import android.app.wearable.WearableSensingManager;

import android.content.Context;
@@ -380,7 +381,11 @@ public abstract class WearableSensingService extends Service { 
     *

     * @param secureWearableConnection The secure connection to the wearable.

     * @param statusConsumer The consumer for the service status.

     * @deprecated Use {@link #onSecureConnectionProvided(ParcelFileDescriptor, PersistableBundle,

     *     Consumer)} instead to receive a remote wearable device connection.

     */

    @FlaggedApi(Flags.FLAG_ENABLE_CONCURRENT_WEARABLE_CONNECTIONS)

    @Deprecated

    @BinderThread

    public void onSecureConnectionProvided(

            @NonNull ParcelFileDescriptor secureWearableConnection,
@@ -389,12 +394,20 @@ public abstract class WearableSensingService extends Service { 
    }



    /**

     * Called when a secure connection to the wearable is available.

     * Called when a secure connection to the wearable is available. See {@link

     * WearableSensingManager#provideConnection(WearableConnection, Executor)} 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 error callback provided by

     * the caller of {@link WearableSensingManager#provideConnection(WearableConnection, Executor)}.

     *

     * <p>The implementing class should override this method. It should return an appropriate status

     * code via {@code statusConsumer} after receiving the {@code secureWearableConnection}.

     *

     * @param secureWearableConnection The secure connection to the wearable.

     * @param metadata Metadata related to the provided connection.

     * @param statusConsumer The consumer for the service status.

     * @see #onSecureConnectionProvided(ParcelFileDescriptor, Consumer)

     */

    @FlaggedApi(Flags.FLAG_ENABLE_CONCURRENT_WEARABLE_CONNECTIONS)

    @BinderThread