Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update contexthub framework based on latest v1.2 spec" into sc-dev

Browse Source
This commit is contained in:
Anthony Stange
2021-03-18 21:05:37 +00:00
committed by Android (Google) Code Review
parent 32a968c45b 0c3c6a92ae
commit 8d97693998
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java
View File

@@ -395,7 +395,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);

24
services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java
View File

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