Remove Google nanoApp references from framework.
Remove references to Google specific code from the framework.
There is code that explictly deals only with Google Nanoapps on
very sepcific devices. Such code should not be in general Android
framework code.
Bug: 29336850
Test: GTS tests pass.
Change-Id: I8c25b0a5b732c36c4a56ce0c2b5d6abf3cb1aa01
diff --git a/services/core/java/com/android/server/location/ContextHubService.java b/services/core/java/com/android/server/location/ContextHubService.java
index 1262737..a4c0fa8 100644
--- a/services/core/java/com/android/server/location/ContextHubService.java
+++ b/services/core/java/com/android/server/location/ContextHubService.java
@@ -29,9 +29,6 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 + ")!");
- }
- }
}