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

Commit 443ac332 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ic83e0d75,I7b173274 into main 

* changes:
  Remove "I" prefix from non-AIDL Context Hub APIs
  Reorder argument names for endpoint discovery callback APIs
parents 27ae8c15 7b118e1c

core/api/system-current.txt

+26 −26
Original line number Diff line number Diff line
@@ -5079,8 +5079,8 @@ package android.hardware.contexthub { 
  }















  @FlaggedApi("android.chre.flags.offload_api") public class HubEndpoint {













    method @Nullable public android.hardware.contexthub.IHubEndpointLifecycleCallback getLifecycleCallback();













    method @Nullable public android.hardware.contexthub.IHubEndpointMessageCallback getMessageCallback();













    method @Nullable public android.hardware.contexthub.HubEndpointLifecycleCallback getLifecycleCallback();













    method @Nullable public android.hardware.contexthub.HubEndpointMessageCallback getMessageCallback();















    method @NonNull public java.util.Collection<android.hardware.contexthub.HubServiceInfo> getServiceInfoCollection();















    method @Nullable public String getTag();















    method public int getVersion();









@@ -5095,14 +5095,19 @@ package android.hardware.contexthub {













  public static final class HubEndpoint.Builder {















    ctor public HubEndpoint.Builder(@NonNull android.content.Context);















    method @NonNull public android.hardware.contexthub.HubEndpoint build();













    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setLifecycleCallback(@NonNull android.hardware.contexthub.IHubEndpointLifecycleCallback);













    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setLifecycleCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.IHubEndpointLifecycleCallback);













    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setMessageCallback(@NonNull android.hardware.contexthub.IHubEndpointMessageCallback);













    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setMessageCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.IHubEndpointMessageCallback);













    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setLifecycleCallback(@NonNull android.hardware.contexthub.HubEndpointLifecycleCallback);













    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setLifecycleCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.HubEndpointLifecycleCallback);













    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setMessageCallback(@NonNull android.hardware.contexthub.HubEndpointMessageCallback);













    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setMessageCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.HubEndpointMessageCallback);















    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setServiceInfoCollection(@NonNull java.util.Collection<android.hardware.contexthub.HubServiceInfo>);















    method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setTag(@NonNull String);















  }



























  @FlaggedApi("android.chre.flags.offload_api") public interface HubEndpointDiscoveryCallback {













    method public void onEndpointsStarted(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>);













    method public void onEndpointsStopped(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>, int);













  }



























  @FlaggedApi("android.chre.flags.offload_api") public final class HubEndpointInfo implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public android.hardware.contexthub.HubEndpointInfo.HubEndpointIdentifier getIdentifier();









@@ -5126,6 +5131,16 @@ package android.hardware.contexthub {













    method public long getHub();















  }



























  @FlaggedApi("android.chre.flags.offload_api") public interface HubEndpointLifecycleCallback {













    method public void onSessionClosed(@NonNull android.hardware.contexthub.HubEndpointSession, int);













    method @NonNull public android.hardware.contexthub.HubEndpointSessionResult onSessionOpenRequest(@NonNull android.hardware.contexthub.HubEndpointInfo, @Nullable String);













    method public void onSessionOpened(@NonNull android.hardware.contexthub.HubEndpointSession);













  }

























  @FlaggedApi("android.chre.flags.offload_api") public interface HubEndpointMessageCallback {













    method public void onMessageReceived(@NonNull android.hardware.contexthub.HubEndpointSession, @NonNull android.hardware.contexthub.HubMessage);













  }



























  @FlaggedApi("android.chre.flags.offload_api") public class HubEndpointSession implements java.lang.AutoCloseable {















    method @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void close();















    method @Nullable public String getServiceDescriptor();










@@ -5174,21 +5189,6 @@ package android.hardware.contexthub {













    method @NonNull public android.hardware.contexthub.HubServiceInfo build();















  }



























  @FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointDiscoveryCallback {













    method public void onEndpointsStarted(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>);













    method public void onEndpointsStopped(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>, int);













  }

























  @FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointLifecycleCallback {













    method public void onSessionClosed(@NonNull android.hardware.contexthub.HubEndpointSession, int);













    method @NonNull public android.hardware.contexthub.HubEndpointSessionResult onSessionOpenRequest(@NonNull android.hardware.contexthub.HubEndpointInfo, @Nullable String);













    method public void onSessionOpened(@NonNull android.hardware.contexthub.HubEndpointSession);













  }

























  @FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointMessageCallback {













    method public void onMessageReceived(@NonNull android.hardware.contexthub.HubEndpointSession, @NonNull android.hardware.contexthub.HubMessage);













  }



























}





























package android.hardware.devicestate {










@@ -6192,16 +6192,16 @@ package android.hardware.location {













    method @Deprecated public int registerCallback(@NonNull android.hardware.location.ContextHubManager.Callback);















    method @Deprecated public int registerCallback(android.hardware.location.ContextHubManager.Callback, android.os.Handler);















    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpoint(@NonNull android.hardware.contexthub.HubEndpoint);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(long, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(long, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, @NonNull java.util.concurrent.Executor);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull String, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull String, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, @NonNull java.util.concurrent.Executor);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback, long);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback, long);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback, @NonNull String);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback, @NonNull String);















    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public int sendMessage(int, int, @NonNull android.hardware.location.ContextHubMessage);















    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public int unloadNanoApp(int);















    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public android.hardware.location.ContextHubTransaction<java.lang.Void> unloadNanoApp(@NonNull android.hardware.location.ContextHubInfo, long);















    method @Deprecated public int unregisterCallback(@NonNull android.hardware.location.ContextHubManager.Callback);















    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void unregisterEndpoint(@NonNull android.hardware.contexthub.HubEndpoint);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void unregisterEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback);













    method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void unregisterEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback);















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















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















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

























core/java/android/hardware/contexthub/HubEndpoint.java



+12
−12




























Original line number
Diff line number
Diff line








@@ -99,8 +99,8 @@ public class HubEndpoint {





























    private final Object mLock = new Object();















    private final HubEndpointInfo mPendingHubEndpointInfo;













    @Nullable private final IHubEndpointLifecycleCallback mLifecycleCallback;













    @Nullable private final IHubEndpointMessageCallback mMessageCallback;













    @Nullable private final HubEndpointLifecycleCallback mLifecycleCallback;













    @Nullable private final HubEndpointMessageCallback mMessageCallback;















    @NonNull private final Executor mLifecycleCallbackExecutor;















    @NonNull private final Executor mMessageCallbackExecutor;


























@@ -335,9 +335,9 @@ public class HubEndpoint {





























    private HubEndpoint(















            @NonNull HubEndpointInfo pendingEndpointInfo,













            @Nullable IHubEndpointLifecycleCallback endpointLifecycleCallback,













            @Nullable HubEndpointLifecycleCallback endpointLifecycleCallback,















            @NonNull Executor lifecycleCallbackExecutor,













            @Nullable IHubEndpointMessageCallback endpointMessageCallback,













            @Nullable HubEndpointMessageCallback endpointMessageCallback,















            @NonNull Executor messageCallbackExecutor) {















        mPendingHubEndpointInfo = pendingEndpointInfo;















        mLifecycleCallback = endpointLifecycleCallback;










@@ -485,12 +485,12 @@ public class HubEndpoint {













    }































    @Nullable













    public IHubEndpointLifecycleCallback getLifecycleCallback() {













    public HubEndpointLifecycleCallback getLifecycleCallback() {















        return mLifecycleCallback;















    }































    @Nullable













    public IHubEndpointMessageCallback getMessageCallback() {













    public HubEndpointMessageCallback getMessageCallback() {















        return mMessageCallback;















    }

























@@ -498,11 +498,11 @@ public class HubEndpoint {













    public static final class Builder {















        private final String mPackageName;





























        @Nullable private IHubEndpointLifecycleCallback mLifecycleCallback;













        @Nullable private HubEndpointLifecycleCallback mLifecycleCallback;































        @NonNull private Executor mLifecycleCallbackExecutor;





























        @Nullable private IHubEndpointMessageCallback mMessageCallback;













        @Nullable private HubEndpointMessageCallback mMessageCallback;















        @NonNull private Executor mMessageCallbackExecutor;































        private int mVersion;










@@ -542,7 +542,7 @@ public class HubEndpoint {













        /** Attach a callback interface for lifecycle events for this Endpoint */















        @NonNull















        public Builder setLifecycleCallback(













                @NonNull IHubEndpointLifecycleCallback lifecycleCallback) {













                @NonNull HubEndpointLifecycleCallback lifecycleCallback) {















            mLifecycleCallback = lifecycleCallback;















            return this;















        }









@@ -554,7 +554,7 @@ public class HubEndpoint {













        @NonNull















        public Builder setLifecycleCallback(















                @NonNull @CallbackExecutor Executor executor,













                @NonNull IHubEndpointLifecycleCallback lifecycleCallback) {













                @NonNull HubEndpointLifecycleCallback lifecycleCallback) {















            mLifecycleCallbackExecutor = executor;















            mLifecycleCallback = lifecycleCallback;















            return this;









@@ -562,7 +562,7 @@ public class HubEndpoint {





























        /** Attach a callback interface for message events for this Endpoint */















        @NonNull













        public Builder setMessageCallback(@NonNull IHubEndpointMessageCallback messageCallback) {













        public Builder setMessageCallback(@NonNull HubEndpointMessageCallback messageCallback) {















            mMessageCallback = messageCallback;















            return this;















        }









@@ -574,7 +574,7 @@ public class HubEndpoint {













        @NonNull















        public Builder setMessageCallback(















                @NonNull @CallbackExecutor Executor executor,













                @NonNull IHubEndpointMessageCallback messageCallback) {













                @NonNull HubEndpointMessageCallback messageCallback) {















            mMessageCallbackExecutor = executor;















            mMessageCallback = messageCallback;















            return this;

































core/java/android/hardware/contexthub/IHubEndpointDiscoveryCallback.java→core/java/android/hardware/contexthub/HubEndpointDiscoveryCallback.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -30,7 +30,7 @@ import java.util.List;













 */















@SystemApi















@FlaggedApi(Flags.FLAG_OFFLOAD_API)













public interface IHubEndpointDiscoveryCallback {













public interface HubEndpointDiscoveryCallback {















    /**















     * Called when a list of hub endpoints have started.















     *

































core/java/android/hardware/contexthub/IHubEndpointLifecycleCallback.java→core/java/android/hardware/contexthub/HubEndpointLifecycleCallback.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -29,7 +29,7 @@ import android.chre.flags.Flags;













 */















@SystemApi















@FlaggedApi(Flags.FLAG_OFFLOAD_API)













public interface IHubEndpointLifecycleCallback {













public interface HubEndpointLifecycleCallback {















    /**















     * Called when an endpoint is requesting a session be opened with another endpoint.















     *

































core/java/android/hardware/contexthub/IHubEndpointMessageCallback.java→core/java/android/hardware/contexthub/HubEndpointMessageCallback.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -26,18 +26,18 @@ import android.chre.flags.Flags;













 * <p>This interface can be attached to an endpoint through {@link















 * HubEndpoint.Builder#setMessageCallback} method. Methods in this interface will only be called















 * when the endpoint is currently registered and has an open session. The endpoint will receive













 * session lifecycle callbacks through {@link IHubEndpointLifecycleCallback}.













 * session lifecycle callbacks through {@link HubEndpointLifecycleCallback}.















 *















 * @hide















 */















@SystemApi















@FlaggedApi(Flags.FLAG_OFFLOAD_API)













public interface IHubEndpointMessageCallback {













public interface HubEndpointMessageCallback {















    /**















     * Callback interface for receiving messages for a particular endpoint session.















     *















     * @param session The session this message is sent through. Previously specified in a {@link













     *     IHubEndpointLifecycleCallback#onSessionOpened(HubEndpointSession)} call.













     *     HubEndpointLifecycleCallback#onSessionOpened(HubEndpointSession)} call.















     * @param message The {@link HubMessage} object representing a message received by the endpoint















     *     that registered this callback interface. This message is constructed by the















     */