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

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

Merge changes from topics "wsm-concurrent", "wsm-read-only-pfd" into main 

* changes:
  Add API to provide read-only file descriptor to WearableSensingService
  Add aconfig flag for the WSM#provideReadOnlyParcelFileDescriptor API
  Enforce concurrent connection limit.
  Allow concurrent WearableSensingService connections
  Remove references to launched flags
parents a42d5f4a 9e738ef9

core/api/system-current.txt

+28 −13
Original line number Diff line number Diff line
@@ -3355,7 +3355,14 @@ 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 {













  @FlaggedApi("android.app.wearable.enable_concurrent_wearable_connections") public interface WearableConnection {













    method @NonNull public android.os.ParcelFileDescriptor getConnection();













    method @NonNull public android.os.PersistableBundle getMetadata();













    method public void onConnectionAccepted();













    method public void onError(int);













  }

























  public final class WearableSensingDataRequest implements android.os.Parcelable {















    method public int describeContents();















    method public int getDataSize();















    method public int getDataType();









@@ -3367,29 +3374,35 @@ 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 @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 @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>);













    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_provide_read_only_pfd") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void provideReadOnlyParcelFileDescriptor(@NonNull android.os.ParcelFileDescriptor, @NonNull android.os.PersistableBundle, @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_concurrent_wearable_connections") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public void removeAllConnections();













    method @FlaggedApi("android.app.wearable.enable_concurrent_wearable_connections") @RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE) public boolean removeConnection(@NonNull android.app.wearable.WearableConnection);















    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 @FlaggedApi("android.app.wearable.enable_concurrent_wearable_connections") public static final int STATUS_MAX_CONCURRENT_CONNECTIONS_EXCEEDED = 9; // 0x9















    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















  }
























@@ -14088,7 +14101,7 @@ package android.service.wallpapereffectsgeneration {



























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









@@ -14101,11 +14114,13 @@ 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 @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 @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>);















    method public abstract void onStopDetection(@NonNull String);

























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



+10
−0






























Original line number
Diff line number
Diff line








@@ -30,9 +30,19 @@ import android.os.SharedMemory;













 * @hide















 */















interface IWearableSensingManager {













     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")













     int getAvailableConnectionCount();















     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")















     void provideConnection(in ParcelFileDescriptor parcelFileDescriptor, in IWearableSensingCallback wearableSensingCallback, in RemoteCallback statusCallback);















     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")













     int provideConcurrentConnection(in ParcelFileDescriptor parcelFileDescriptor, in PersistableBundle metadata, in IWearableSensingCallback wearableSensingCallback, in RemoteCallback statusCallback);













     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")













     boolean removeConnection(int connectionId);













     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")













     void removeAllConnections();













     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")













     void provideReadOnlyParcelFileDescriptor(in ParcelFileDescriptor parcelFileDescriptor, in PersistableBundle metadata, in RemoteCallback statusCallback);













     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")















     void provideDataStream(in ParcelFileDescriptor parcelFileDescriptor, in @nullable IWearableSensingCallback wearableSensingCallback, in RemoteCallback statusCallback);















     @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_WEARABLE_SENSING_SERVICE)")















     void provideData(in PersistableBundle data, in SharedMemory sharedMemory, in RemoteCallback callback);

































core/java/android/app/wearable/WearableConnection.java
0 → 100644



+64
−0






























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2024 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.app.wearable;



























import android.annotation.FlaggedApi;













import android.annotation.NonNull;













import android.annotation.SystemApi;













import android.os.ParcelFileDescriptor;













import android.os.PersistableBundle;



























import java.util.concurrent.Executor;













import java.util.function.Consumer;



























/**













 * A connection to a remote wearable device.













 *













 * @hide













 */













@SystemApi













@FlaggedApi(Flags.FLAG_ENABLE_CONCURRENT_WEARABLE_CONNECTIONS)













public interface WearableConnection {



























    /** Returns the connection to provide. */













    @NonNull













    ParcelFileDescriptor getConnection();



























    /** Returns the metadata related to this connection. */













    @NonNull













    PersistableBundle getMetadata();



























    /**













     * Callback method called when the connection is accepted by the WearableSensingService.













     *













     * <p>See {@link WearableSensingManager#provideConnection(ParcelFileDescriptor, Executor,













     * Consumer)} for details about the relationship between the connection provided via {@link













     * #getConnection()} and the connection accepted by the WearableSensingService.













     *













     * <p>There will be no new invocation of this callback method after the connection is removed.













     * Ongoing invocation will continue to run.













     */













    void onConnectionAccepted();



























    /**













     * Callback method called when an error occurred during secure connection setup.













     *













     * <p>There will be no new invocation of this callback method after the connection is removed.













     * Ongoing invocation will continue to run.













     */













    void onError(@WearableSensingManager.StatusCode int errorCode);













}
























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



+263
−79




























File changed.
Preview size limit exceeded, changes collapsed.