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

Commit 96219b87 authored by Tom Chan's avatar Tom Chan
Browse files

Remove references to launched flags 

Test: atest CtsWearableSensingServiceTestCases, no test ignored or
failed assumption
Bug: 301427767
Flag: EXEMPT removing enable_unsupported_operation_status_code,
enable_data_request_observer_api,
enable_provide_wearable_connection_api, enable_restart_wss_process

Change-Id: I13ce0fd9aa804a063c8e77bb207dae40e8bd46a0
parent feaf5240

core/api/system-current.txt

+13 −13
Original line number Diff line number Diff line
@@ -3353,7 +3353,7 @@ package android.app.wallpapereffectsgeneration { 














package android.app.wearable {



























  @FlaggedApi("android.app.wearable.enable_data_request_observer_api") public final class WearableSensingDataRequest implements android.os.Parcelable {













  public final class WearableSensingDataRequest implements android.os.Parcelable {















    method public int describeContents();















    method public int getDataSize();















    method public int getDataType();









@@ -3365,29 +3365,29 @@ package android.app.wearable {













    field @NonNull public static final android.os.Parcelable.Creator<android.app.wearable.WearableSensingDataRequest> CREATOR;















  }



























  @FlaggedApi("android.app.wearable.enable_data_request_observer_api") public static final class WearableSensingDataRequest.Builder {













  public static final class WearableSensingDataRequest.Builder {















    ctor public WearableSensingDataRequest.Builder(int);















    method @NonNull public android.app.wearable.WearableSensingDataRequest build();















    method @NonNull public android.app.wearable.WearableSensingDataRequest.Builder setRequestDetails(@NonNull android.os.PersistableBundle);















  }





























  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 @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 @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>);













    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 @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>);













    method @FlaggedApi("android.app.wearable.enable_data_request_observer_api") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void unregisterDataRequestObserver(int, @NonNull android.app.PendingIntent, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void unregisterDataRequestObserver(int, @NonNull android.app.PendingIntent, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    field public static final int STATUS_ACCESS_DENIED = 5; // 0x5













    field @FlaggedApi("android.app.wearable.enable_provide_wearable_connection_api") public static final int STATUS_CHANNEL_ERROR = 7; // 0x7













    field public static final int STATUS_CHANNEL_ERROR = 7; // 0x7















    field public static final int STATUS_SERVICE_UNAVAILABLE = 3; // 0x3















    field public static final int STATUS_SUCCESS = 1; // 0x1















    field public static final int STATUS_UNKNOWN = 0; // 0x0















    field @Deprecated public static final int STATUS_UNSUPPORTED = 2; // 0x2













    field @FlaggedApi("android.app.wearable.enable_data_request_observer_api") public static final int STATUS_UNSUPPORTED_DATA_TYPE = 8; // 0x8













    field @FlaggedApi("android.app.wearable.enable_unsupported_operation_status_code") public static final int STATUS_UNSUPPORTED_OPERATION = 6; // 0x6













    field public static final int STATUS_UNSUPPORTED_DATA_TYPE = 8; // 0x8













    field public static final int STATUS_UNSUPPORTED_OPERATION = 6; // 0x6















    field public static final int STATUS_WEARABLE_UNAVAILABLE = 4; // 0x4















  }
























@@ -14021,7 +14021,7 @@ package android.service.watchdog {



























package android.service.wearable {



























  @FlaggedApi("android.app.wearable.enable_data_request_observer_api") public interface WearableSensingDataRequester {













  public interface WearableSensingDataRequester {















    method public void requestData(@NonNull android.app.wearable.WearableSensingDataRequest, @NonNull java.util.function.Consumer<java.lang.Integer>);















    field public static final int STATUS_OBSERVER_CANCELLED = 2; // 0x2















    field public static final int STATUS_SUCCESS = 1; // 0x1









@@ -14034,11 +14034,11 @@ package android.service.wearable {













    ctor public WearableSensingService();















    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);















    method @BinderThread public abstract void onDataProvided(@NonNull android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.function.Consumer<java.lang.Integer>);













    method @FlaggedApi("android.app.wearable.enable_data_request_observer_api") @BinderThread public void onDataRequestObserverRegistered(int, @NonNull String, @NonNull android.service.wearable.WearableSensingDataRequester, @NonNull java.util.function.Consumer<java.lang.Integer>);













    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 void onDataRequestObserverRegistered(int, @NonNull String, @NonNull android.service.wearable.WearableSensingDataRequester, @NonNull java.util.function.Consumer<java.lang.Integer>);













    method @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 onSecureConnectionProvided(@NonNull android.os.ParcelFileDescriptor, @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 @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/WearableSensingDataRequest.java



+0
−3






























Original line number
Diff line number
Diff line








@@ -16,7 +16,6 @@





























package android.app.wearable;





























import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.SystemApi;















import android.os.Parcel;









@@ -30,7 +29,6 @@ import java.time.Duration;













 *















 * @hide















 */













@FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















@SystemApi















public final class WearableSensingDataRequest implements Parcelable {















    private static final int MAX_REQUEST_SIZE = 200;










@@ -164,7 +162,6 @@ public final class WearableSensingDataRequest implements Parcelable {













    }































    /** A builder for WearableSensingDataRequest. */













    @FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















    public static final class Builder {















        private int mDataType;















        private PersistableBundle mRequestDetails;

































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



+0
−7






























Original line number
Diff line number
Diff line








@@ -132,7 +132,6 @@ public class WearableSensingManager {













     * The value of the status code that indicates the method called is not supported by the















     * implementation of {@link WearableSensingService}.















     */













    @FlaggedApi(Flags.FLAG_ENABLE_UNSUPPORTED_OPERATION_STATUS_CODE)















    public static final int STATUS_UNSUPPORTED_OPERATION = 6;































    /**









@@ -140,11 +139,9 @@ public class WearableSensingManager {













     * by the provided connection. See {@link #provideConnection(ParcelFileDescriptor,















     * Executor, Consumer)}.















     */













    @FlaggedApi(Flags.FLAG_ENABLE_PROVIDE_WEARABLE_CONNECTION_API)















    public static final int STATUS_CHANNEL_ERROR = 7;































    /** The value of the status code that indicates the provided data type is not supported. */













    @FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















    public static final int STATUS_UNSUPPORTED_DATA_TYPE = 8;































    /** @hide */










@@ -183,7 +180,6 @@ public class WearableSensingManager {













     * @return The WearableSensingDataRequest in the provided Intent, or null if the Intent does not















     *     contain a WearableSensingDataRequest.















     */













    @FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















    @Nullable















    public static WearableSensingDataRequest getDataRequestFromIntent(@NonNull Intent intent) {















        return intent.getParcelableExtra(










@@ -249,7 +245,6 @@ public class WearableSensingManager {













     *     and errors in the encrypted channel.















     */















    @RequiresPermission(Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)













    @FlaggedApi(Flags.FLAG_ENABLE_PROVIDE_WEARABLE_CONNECTION_API)















    public void provideConnection(















            @NonNull ParcelFileDescriptor wearableConnection,















            @NonNull @CallbackExecutor Executor executor,










@@ -390,7 +385,6 @@ public class WearableSensingManager {













     * @param executor Executor on which to run the consumer callback.















     * @param statusConsumer A consumer that handles the status code for the observer registration.















     */













    @FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















    @RequiresPermission(Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)















    public void registerDataRequestObserver(















            int dataType,









@@ -417,7 +411,6 @@ public class WearableSensingManager {













     * @param statusConsumer A consumer that handles the status code for the observer















     *     unregistration.















     */













    @FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















    @RequiresPermission(Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)















    public void unregisterDataRequestObserver(















            int dataType,

































core/java/android/service/wearable/WearableSensingDataRequester.java



+0
−3






























Original line number
Diff line number
Diff line








@@ -16,11 +16,9 @@





























package android.service.wearable;





























import android.annotation.FlaggedApi;















import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.SystemApi;













import android.app.wearable.Flags;















import android.app.wearable.WearableSensingDataRequest;































import java.lang.annotation.Retention;









@@ -32,7 +30,6 @@ import java.util.function.Consumer;













 *















 * @hide















 */













@FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















@SystemApi















public interface WearableSensingDataRequester {

















































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



+0
−3






























Original line number
Diff line number
Diff line








@@ -353,7 +353,6 @@ public abstract class WearableSensingService extends Service {













     * @param secureWearableConnection The secure connection to the wearable.















     * @param statusConsumer The consumer for the service status.















     */













    @FlaggedApi(Flags.FLAG_ENABLE_PROVIDE_WEARABLE_CONNECTION_API)















    @BinderThread















    public void onSecureConnectionProvided(















            @NonNull ParcelFileDescriptor secureWearableConnection,










@@ -419,7 +418,6 @@ public abstract class WearableSensingService extends Service {













     * @param statusConsumer the consumer for the status of the data request observer registration.















     *     This is different from the status for each data request.















     */













    @FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















    @BinderThread















    public void onDataRequestObserverRegistered(















            int dataType,










@@ -447,7 +445,6 @@ public abstract class WearableSensingService extends Service {













     * @param statusConsumer the consumer for the status of the data request observer















     *     unregistration. This is different from the status for each data request.















     */













    @FlaggedApi(Flags.FLAG_ENABLE_DATA_REQUEST_OBSERVER_API)















    @BinderThread















    public void onDataRequestObserverUnregistered(















            int dataType,