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

Commit 3640e558 authored by Tom Chan's avatar Tom Chan
Browse files

Allow concurrent WearableSensingService connections 

The enforcement for max concurrent connection limit will be added in a
follow-up change shortly after this.

The old provideConnection API will be deprecated in a separate CL
because deprecation cannot be flagged and can only be done after 25Q2
becomes next.

Bug: 358133158
Flag: android.app.wearable.enable_concurrent_wearable_connections
Test: atest CtsWearableSensingServiceTestCases after patching ag/29937309
Change-Id: I2a71d2f1d4e0d1ad1db1c3a251fbacaa91e0abba
parent 96219b87

core/api/system-current.txt

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














package android.app.wearable {



























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









@@ -3372,16 +3379,21 @@ 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 @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 @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 @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 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










@@ -14039,6 +14051,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 @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



+8
−0






























Original line number
Diff line number
Diff line








@@ -30,9 +30,17 @@ 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 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/WearableSensingManager.java



+237
−75




























File changed.
Preview size limit exceeded, changes collapsed.
























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



+2
−0






























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.service.wearable;





























import android.app.ambientcontext.AmbientContextEventRequest;















import android.app.wearable.IWearableSensingCallback;













import android.os.ParcelFileDescriptor;















import android.os.PersistableBundle;















import android.os.RemoteCallback;















import android.os.SharedMemory;









@@ -30,6 +31,7 @@ import android.os.SharedMemory;













 */















oneway interface IWearableSensingService {















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













    void provideConcurrentSecureConnection(in ParcelFileDescriptor parcelFileDescriptor, in PersistableBundle metadata, in IWearableSensingCallback wearableSensingCallback, in RemoteCallback statusCallback);















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















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