From 0c3c6a92aeeca99b22922596f8c89386b7817e68 Mon Sep 17 00:00:00 2001 From: Anthony Stange Date: Wed, 17 Mar 2021 17:33:33 +0000 Subject: [PATCH] Update contexthub framework based on latest v1.2 spec Bug: 180606685 Test: Load and verify contexthub can show up and messages can be sent Change-Id: Ia33c705d46b423db3313c44b2d4feba26fef491b --- .../contexthub/ContextHubClientBroker.java | 2 +- .../contexthub/IContextHubWrapper.java | 24 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java b/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java index e1c011d821a7f..ae314c4ca0508 100644 --- a/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java +++ b/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java @@ -368,7 +368,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub int contextHubId = mAttachedContextHubInfo.getId(); try { - result = mContextHubProxy.sendMessageToHub(contextHubId, messageToNanoApp); + result = mContextHubProxy.getHub().sendMessageToHub(contextHubId, messageToNanoApp); } catch (RemoteException e) { Log.e(TAG, "RemoteException in sendMessageToNanoApp (target hub ID = " + contextHubId + ")", e); diff --git a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java index 3a5c220eeeae7..3245fdfaebd60 100644 --- a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java +++ b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java @@ -103,12 +103,6 @@ public abstract class IContextHubWrapper { public abstract void registerCallback( int hubId, IContexthubCallback callback) throws RemoteException; - /** - * Calls the appropriate sendMessageToHub function depending on the HAL version. - */ - public abstract int sendMessageToHub(int hubId, - android.hardware.contexthub.V1_0.ContextHubMsg message) throws RemoteException; - /** * @return A valid instance of Contexthub HAL 1.0. */ @@ -180,11 +174,6 @@ public abstract class IContextHubWrapper { mHub.registerCallback(hubId, callback); } - public int sendMessageToHub(int hubId, - android.hardware.contexthub.V1_0.ContextHubMsg message) throws RemoteException { - return mHub.sendMessageToHub(hubId, message); - } - public android.hardware.contexthub.V1_0.IContexthub getHub() { return mHub; } @@ -234,11 +223,6 @@ public abstract class IContextHubWrapper { mHub.registerCallback(hubId, callback); } - public int sendMessageToHub(int hubId, - android.hardware.contexthub.V1_0.ContextHubMsg message) throws RemoteException { - return mHub.sendMessageToHub(hubId, message); - } - public android.hardware.contexthub.V1_0.IContexthub getHub() { return mHub; } @@ -304,14 +288,6 @@ public abstract class IContextHubWrapper { mHub.registerCallback_1_2(hubId, callback); } - public int sendMessageToHub(int hubId, - android.hardware.contexthub.V1_0.ContextHubMsg message) throws RemoteException { - android.hardware.contexthub.V1_2.ContextHubMsg newMessage = - new android.hardware.contexthub.V1_2.ContextHubMsg(); - newMessage.msg_1_0 = message; - return mHub.sendMessageToHub_1_2(hubId, newMessage); - } - public android.hardware.contexthub.V1_0.IContexthub getHub() { return mHub; }