Updates for Marshmallow support.

wardellbagby · Nov 16, 2015 · 57cd5c1 · 57cd5c1
1 parent 4dea4b8
commit 57cd5c1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/.idea/Disable Proximitiy Sensor.iml b/.idea/Disable Proximitiy Sensor.iml
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mrchandler.disableprox"
-    android:versionCode="2"
-    android:versionName="1.0.1" >
+    android:versionCode="3"
+    android:versionName="1.0.2" >
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="23" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Proximity Sensor Disabler
 ========================
 
-This disables the proximity sensor in 4.1 - 5.0.1 devices. It has not been tested on anything less than 4.1, and does not currently work on 5.1.
+This disables the proximity sensor in 4.1 - 6.0 devices. It has not been tested on anything less than 4.1, and does currently have Marshmallow support.  
 
 Installation
 ------------

diff --git a/src/com/mrchandler/disableprox/XposedMod.java b/src/com/mrchandler/disableprox/XposedMod.java
@@ -49,24 +49,28 @@ protected void beforeHookedMethod(MethodHookParam param) {
                         }
                 );
             } else {
-
                 XposedHelpers.findAndHookMethod(
                         "android.hardware.SystemSensorManager$SensorEventQueue", lpparam.classLoader, "dispatchSensorEvent", int.class, float[].class, int.class, long.class, new XC_MethodHook() {
                             @SuppressWarnings("unchecked")
                             @Override
                             protected void beforeHookedMethod(MethodHookParam param)
                                     throws Throwable {
                                 // This pulls the 'Handle to Sensor' array straight from the SystemSensorManager class, so it should always pull the appropriate sensor.
-                                SparseArray<Sensor> sensors = (SparseArray<Sensor>) XposedHelpers.getStaticObjectField(systemSensorManager, "sHandleToSensor");
+                                SparseArray<Sensor> sensors;
+                                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                                    sensors = (SparseArray<Sensor>) XposedHelpers.getStaticObjectField(systemSensorManager, "sHandleToSensor");
+                                } else {
+                                    Object systemSensorManager = XposedHelpers.getObjectField(param.thisObject, "mManager");
+                                    sensors = (SparseArray<Sensor>) XposedHelpers.getObjectField(systemSensorManager, "mHandleToSensor");
+                                }
 
                                 // params.args[] is an array that holds the arguments that dispatchSensorEvent received, which are a handle pointing to a sensor
                                 // in sHandleToSensor and a float[] of values that should be applied to that sensor.
                                 int handle = (Integer) (param.args[0]); // This tells us which sensor was currently called.
                                 Sensor s = sensors.get(handle);
                                 if (s.getType() == Sensor.TYPE_PROXIMITY) {// This could be expanded to disable ANY sensor.
-
                                     float[] values = (float[]) param.args[1];
-                                    values[0] = 100f;
+                                    values[0] = s.getMaximumRange();
                                     param.args[1] = values;
                                 }
                             }