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

Remove HIDL references in ContextHubClientBroker/Manager

Browse Source 
Bug: 194285834
Test: Presubmits
Change-Id: I91394259f819005cecf297d3268e85b4b4fb95bc
This commit is contained in:
Arthur Ishiguro
2021-08-30 12:07:55 -07:00
parent ab1d302c75
commit ed470dafb8
4 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,6 @@ import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter;
import android.content.Context;
import android.content.Intent;
import android.hardware.contexthub.V1_0.ContextHubMsg;
import android.hardware.contexthub.V1_0.Result;
import android.hardware.location.ContextHubInfo;
import android.hardware.location.ContextHubManager;
import android.hardware.location.ContextHubTransaction;
@@ -383,23 +381,20 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
checkNanoappPermsAsync();
}
ContextHubMsg messageToNanoApp =
ContextHubServiceUtil.createHidlContextHubMessage(mHostEndPointId, message);
int contextHubId = mAttachedContextHubInfo.getId();
try {
result = mContextHubProxy.getHub().sendMessageToHub(contextHubId, messageToNanoApp);
result = mContextHubProxy.sendMessageToContextHub(
mHostEndPointId, mAttachedContextHubInfo.getId(), message);
} catch (RemoteException e) {
Log.e(TAG, "RemoteException in sendMessageToNanoApp (target hub ID = "
+ contextHubId + ")", e);
result = Result.UNKNOWN_FAILURE;
+ mAttachedContextHubInfo.getId() + ")", e);
result = ContextHubTransaction.RESULT_FAILED_UNKNOWN;
}
} else {
Log.e(TAG, "Failed to send message to nanoapp: client connection is closed");
result = Result.UNKNOWN_FAILURE;
result = ContextHubTransaction.RESULT_FAILED_UNKNOWN;
}
return ContextHubServiceUtil.toTransactionResult(result);
return result;
}
/**

23
services/core/java/com/android/server/location/contexthub/ContextHubClientManager.java
View File

@@ -19,7 +19,6 @@ package com.android.server.location.contexthub;
import android.annotation.IntDef;
import android.app.PendingIntent;
import android.content.Context;
import android.hardware.contexthub.V1_0.ContextHubMsg;
import android.hardware.location.ContextHubInfo;
import android.hardware.location.IContextHubClient;
import android.hardware.location.IContextHubClientCallback;
@@ -227,37 +226,37 @@ import java.util.function.Consumer;
* Handles a message sent from a nanoapp.
*
* @param contextHubId the ID of the hub where the nanoapp sent the message from
* @param hostEndpointId The host endpoint ID of the client that this message is for.
* @param message the message send by a nanoapp
* @param nanoappPermissions the set of permissions the nanoapp holds
* @param messagePermissions the set of permissions that should be used for attributing
* permissions when this message is consumed by a client
*/
/* package */ void onMessageFromNanoApp(
int contextHubId, ContextHubMsg message, List<String> nanoappPermissions,
List<String> messagePermissions) {
NanoAppMessage clientMessage = ContextHubServiceUtil.createNanoAppMessage(message);
int contextHubId, short hostEndpointId, NanoAppMessage message,
List<String> nanoappPermissions, List<String> messagePermissions) {
if (DEBUG_LOG_ENABLED) {
Log.v(TAG, "Received " + clientMessage);
Log.v(TAG, "Received " + message);
}
if (clientMessage.isBroadcastMessage()) {
if (message.isBroadcastMessage()) {
// Broadcast messages shouldn't be sent with any permissions tagged per CHRE API
// requirements.
if (!messagePermissions.isEmpty()) {
Log.wtf(TAG, "Received broadcast message with permissions from " + message.appName);
Log.wtf(TAG, "Received broadcast message with permissions from "
+ message.getNanoAppId());
}
broadcastMessage(
contextHubId, clientMessage, nanoappPermissions, messagePermissions);
contextHubId, message, nanoappPermissions, messagePermissions);
} else {
ContextHubClientBroker proxy = mHostEndPointIdToClientMap.get(message.hostEndPoint);
ContextHubClientBroker proxy = mHostEndPointIdToClientMap.get(hostEndpointId);
if (proxy != null) {
proxy.sendMessageToClient(
clientMessage, nanoappPermissions, messagePermissions);
message, nanoappPermissions, messagePermissions);
} else {
Log.e(TAG, "Cannot send message to unregistered client (host endpoint ID = "
+ message.hostEndPoint + ")");
+ hostEndpointId + ")");
}
}
}

4
services/core/java/com/android/server/location/contexthub/ContextHubService.java
View File

@@ -636,8 +636,10 @@ public class ContextHubService extends IContextHubService.Stub {
private void handleClientMessageCallback(
int contextHubId, ContextHubMsg message, List<String> nanoappPermissions,
List<String> messagePermissions) {
NanoAppMessage clientMessage = ContextHubServiceUtil.createNanoAppMessage(message);
mClientManager.onMessageFromNanoApp(
contextHubId, message, nanoappPermissions, messagePermissions);
contextHubId, message.hostEndPoint, clientMessage, nanoappPermissions,
messagePermissions);
}
/**

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

@@ -17,10 +17,13 @@ package com.android.server.location.contexthub;
import android.annotation.Nullable;
import android.hardware.contexthub.V1_0.ContextHub;
import android.hardware.contexthub.V1_0.ContextHubMsg;
import android.hardware.contexthub.V1_1.Setting;
import android.hardware.contexthub.V1_1.SettingValue;
import android.hardware.contexthub.V1_2.IContexthubCallback;
import android.hardware.location.ContextHubInfo;
import android.hardware.location.ContextHubTransaction;
import android.hardware.location.NanoAppMessage;
import android.os.RemoteException;
import android.util.Log;
import android.util.Pair;
@@ -148,21 +151,55 @@ public abstract class IContextHubWrapper {
public abstract void onAirplaneModeSettingChanged(boolean enabled);
/**
* @return True if this version of the Contexthub HAL supports microphone
* disable setting notifications.
* @return True if this version of the Contexthub HAL supports microphone disable setting
* notifications.
*/
public abstract boolean supportsMicrophoneDisableSettingNotifications();
/**
* Notifies the Contexthub implementation of a microphone disable setting
* change.
* Notifies the Contexthub implementation of a microphone disable setting change.
*/
public abstract void onMicrophoneDisableSettingChanged(boolean enabled);
private static class ContextHubWrapperV1_0 extends IContextHubWrapper {
/**
* Sends a message to the Context Hub.
*
* @param hostEndpointId The host endpoint ID of the sender.
* @param contextHubId The ID of the Context Hub to send the message to.
* @param message The message to send.
* @return the result of the message sending.
*/
@ContextHubTransaction.Result
public abstract int sendMessageToContextHub(
short hostEndpointId, int contextHubId, NanoAppMessage message)
throws RemoteException;
/**
* An abstract call that defines methods common to all HIDL IContextHubWrappers.
*/
private abstract static class ContextHubWrapperHidl extends IContextHubWrapper {
private android.hardware.contexthub.V1_0.IContexthub mHub;
ContextHubWrapperHidl(android.hardware.contexthub.V1_0.IContexthub hub) {
mHub = hub;
}
@ContextHubTransaction.Result
public int sendMessageToContextHub(
short hostEndpointId, int contextHubId, NanoAppMessage message)
throws RemoteException {
ContextHubMsg messageToNanoApp =
ContextHubServiceUtil.createHidlContextHubMessage(hostEndpointId, message);
return ContextHubServiceUtil.toTransactionResult(
mHub.sendMessageToHub(contextHubId, messageToNanoApp));
}
}
private static class ContextHubWrapperV1_0 extends ContextHubWrapperHidl {
private android.hardware.contexthub.V1_0.IContexthub mHub;
ContextHubWrapperV1_0(android.hardware.contexthub.V1_0.IContexthub hub) {
super(hub);
mHub = hub;
}
@@ -212,10 +249,11 @@ public abstract class IContextHubWrapper {
}
}
private static class ContextHubWrapperV1_1 extends IContextHubWrapper {
private static class ContextHubWrapperV1_1 extends ContextHubWrapperHidl {
private android.hardware.contexthub.V1_1.IContexthub mHub;
ContextHubWrapperV1_1(android.hardware.contexthub.V1_1.IContexthub hub) {
super(hub);
mHub = hub;
}
@@ -271,7 +309,7 @@ public abstract class IContextHubWrapper {
}
}
private static class ContextHubWrapperV1_2 extends IContextHubWrapper
private static class ContextHubWrapperV1_2 extends ContextHubWrapperHidl
implements android.hardware.contexthub.V1_2.IContexthub.getHubs_1_2Callback {
private final android.hardware.contexthub.V1_2.IContexthub mHub;
@@ -279,6 +317,7 @@ public abstract class IContextHubWrapper {
new Pair<>(Collections.emptyList(), Collections.emptyList());
ContextHubWrapperV1_2(android.hardware.contexthub.V1_2.IContexthub hub) {
super(hub);
mHub = hub;
}