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

Merge "Remove Google nanoApp references from framework."

Browse Source
This commit is contained in:
Ashutosh Joshi
2017-01-09 21:08:37 +00:00
committed by Android (Google) Code Review
parent e2489c67e1 290c320024
commit 484b4238b8
1 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,9 +29,6 @@ import android.hardware.location.NanoApp;
import android.hardware.location.NanoAppInstanceInfo;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.service.vr.IVrManager;
import android.service.vr.IVrStateCallbacks;
import android.util.Log;
import java.io.FileDescriptor;
@@ -51,7 +48,6 @@ public class ContextHubService extends IContextHubService.Stub {
private static final String ENFORCE_HW_PERMISSION_MESSAGE = "Permission '"
+ HARDWARE_PERMISSION + "' not granted to access ContextHub Hardware";
public static final int ANY_HUB = -1;
public static final int MSG_LOAD_NANO_APP = 3;
public static final int MSG_UNLOAD_NANO_APP = 4;
@@ -73,8 +69,6 @@ public class ContextHubService extends IContextHubService.Stub {
private static final int OS_APP_INSTANCE = -1;
private static final long APP_ID_ACTIVITY_RECOGNITION = 0x476f6f676c001000L;
private final Context mContext;
private final ConcurrentHashMap<Integer, NanoAppInstanceInfo> mNanoAppHash =
new ConcurrentHashMap<>();
@@ -85,18 +79,6 @@ public class ContextHubService extends IContextHubService.Stub {
private native int nativeSendMessage(int[] header, byte[] data);
private native ContextHubInfo[] nativeInitialize();
private final IVrStateCallbacks mVrStateCallbacks = new IVrStateCallbacks.Stub() {
@Override
public void onVrStateChanged(boolean enabled) {
for (NanoAppInstanceInfo app : mNanoAppHash.values()) {
if (app.getAppId() == APP_ID_ACTIVITY_RECOGNITION) {
sendVrStateChangeMessageToApp(app, enabled);
break;
}
}
}
};
public ContextHubService(Context context) {
mContext = context;
mContextHubInfo = nativeInitialize();
@@ -105,18 +87,6 @@ public class ContextHubService extends IContextHubService.Stub {
Log.d(TAG, "ContextHub[" + i + "] id: " + mContextHubInfo[i].getId()
+ ", name: " + mContextHubInfo[i].getName());
}
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_VR_MODE)) {
IVrManager vrManager =
IVrManager.Stub.asInterface(ServiceManager.getService("vrmanager"));
if (vrManager != null) {
try {
vrManager.registerListener(mVrStateCallbacks);
} catch (RemoteException e) {
Log.e(TAG, "VR state listener registration failed", e);
}
}
}
}
@Override
@@ -394,19 +364,4 @@ public class ContextHubService extends IContextHubService.Stub {
return 0;
}
private void sendVrStateChangeMessageToApp(NanoAppInstanceInfo app, boolean vrModeEnabled) {
int[] msgHeader = new int[MSG_HEADER_SIZE];
msgHeader[HEADER_FIELD_MSG_TYPE] = 0;
msgHeader[HEADER_FIELD_MSG_VERSION] = 0;
msgHeader[HEADER_FIELD_HUB_HANDLE] = ANY_HUB;
msgHeader[HEADER_FIELD_APP_INSTANCE] = app.getHandle();
byte[] data = new byte[1];
data[0] = (byte) ((vrModeEnabled) ? 1 : 0);
int ret = nativeSendMessage(msgHeader, data);
if (ret != 0) {
Log.e(TAG, "Couldn't send VR state change notification (" + ret + ")!");
}
}
}