Merge branch '3.6.x_dev' into 3.6.x

SpazeDog · Dec 21, 2015 · fb72d7a · fb72d7a
2 parents e194642 + 81aea0d
commit fb72d7a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/projects/xposedAdditions/build.gradle b/projects/xposedAdditions/build.gradle
@@ -11,8 +11,8 @@ android {
 
         minSdkVersion 9
         targetSdkVersion 22
-        versionCode 74
-        versionName "3.6.2"
+        versionCode 75
+        versionName "3.6.3"
     }
 
     sourceSets {

diff --git a/src/java/com/spazedog/xposed/additionsgb/backend/pwm/iface/IMediatorSetup.java b/src/java/com/spazedog/xposed/additionsgb/backend/pwm/iface/IMediatorSetup.java
@@ -286,7 +286,17 @@ protected IMediatorSetup(ReflectClass pwm, XServiceManager xServiceManager) {
 		 * Get the Power Management tools
 		 */
 		mPowerManager = ReflectClass.fromReceiver(((Context) mContext.getReceiver()).getSystemService(Context.POWER_SERVICE));
-		mPowerManagerService = (ReflectClass) mPowerManager.findField("mService").getValue(Result.INSTANCE);
+
+        try {
+            mPowerManagerService = (ReflectClass) mPowerManager.findField("mService").getValue(Result.INSTANCE);
+
+        } catch (ReflectException e) {
+            /*
+             * This is a work-around for devices that is heavily modified, like Amazon Fire Phone where the above field for some reason returns NULL
+             */
+            mPowerManagerService = ReflectClass.fromName("android.os.IPowerManager").bindInterface("power");
+        }
+
 		mWakelock = ((PowerManager) mPowerManager.getReceiver()).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "HookedPhoneWindowManager");
 
 		/*