commit 4d70e6a3c044c4e29d84835a026b3e70b44b66e8
author Ben Fennema <fennema@google.com> Wed Dec 02 01:06:12 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 02 01:06:12 2015 +0000
tree bb8e9311bd87ab135c2b4c546aee8abd9e6b0abf
parent ec7180f7333777582e642fc54f7106d500b7da33
parent e9970bc981e39af07633066d3276f1f786267dcf

Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev

core/java/android/hardware/SensorManager.java

diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index 506d710..5d405f9 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -1684,27 +1684,4 @@
         }
         return delay;
     }
-
-    /**
-     * Send configuration string to Sensor HAL.
-     *
-     * @param data String which includes sensor physical data.
-     *        Sensor HAL is taking care of parsing data from string and
-     *        setting values to Sensor HW.
-     *
-     * @return true if successfully send to HAL.
-     */
-     /**
-     * @hide
-     */
-    public boolean SetPhysicalData(String data)
-    {
-        //Log.d(TAG, "SensorManager.SetPhysicalData(" + data + ")");
-        return SetPhysicalDataImpl(data);
-    }
-
-     /**
-     * @hide
-     */
-     protected abstract boolean SetPhysicalDataImpl(String data);
 }

core/java/android/hardware/SystemSensorManager.java

diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java
index bf9722e4..2fe8fb6 100644
--- a/core/java/android/hardware/SystemSensorManager.java
+++ b/core/java/android/hardware/SystemSensorManager.java
@@ -45,7 +45,6 @@
     private static native boolean nativeGetSensorAtIndex(long nativeInstance,
             Sensor sensor, int index);
     private static native boolean nativeIsDataInjectionEnabled(long nativeInstance);
-    private static native boolean nativeSetPhysicalData(long nativeInstance, String data);
 
     private static boolean sSensorModuleInitialized = false;
     private static InjectEventQueue mInjectEventQueue = null;
@@ -275,13 +274,6 @@
         }
     }
 
-    @Override
-    protected boolean SetPhysicalDataImpl(String data)
-    {
-        //Log.d(TAG, "SystemSensorManager.SetPhysicalDataImpl(" + data + ")");
-        return nativeSetPhysicalData(mNativeInstance,data);
-    }
-
     /*
      * BaseEventQueue is the communication channel with the sensor service,
      * SensorEventQueue, TriggerEventQueue are subclases and there is one-to-one mapping between

core/jni/android_hardware_SensorManager.cpp

diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index b8c28a0..7d0afdc 100644
--- a/core/jni/android_hardware_SensorManager.cpp
+++ b/core/jni/android_hardware_SensorManager.cpp
@@ -185,18 +185,6 @@
     return mgr->isDataInjectionEnabled();
 }
 
-static jboolean nativeSetPhysicalData(JNIEnv *env, jclass clazz,jlong sensorManager, jstring javaString)
-{
-    SensorManager* mgr = reinterpret_cast<SensorManager*>(sensorManager);
-    const char *nativeString = env->GetStringUTFChars(javaString, JNI_FALSE);
-    bool return_value;
-
-    //ALOGD("android_hardware_SensorManager, call JNI function nativeSetPhysicalData(%s)",nativeString);
-    return_value = mgr->SetPhysicalData(nativeString);
-
-    env->ReleaseStringUTFChars(javaString, nativeString);
-    return return_value;
-}
 //----------------------------------------------------------------------------
 
 class Receiver : public LooperCallback {
@@ -370,9 +358,6 @@
     {"nativeIsDataInjectionEnabled",
             "(J)Z",
             (void*)nativeIsDataInjectionEnabled},
-    {"nativeSetPhysicalData",
-            "(JLjava/lang/String;)Z",
-            (void*)nativeSetPhysicalData },
 };
 
 static JNINativeMethod gBaseEventQueueMethods[] = {