Fixed privacy service not running with older Xposed releases

Closes #2206
M66B · May 25, 2015 · bba3476 · bba3476
1 parent 757b41d
commit bba3476
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="biz.bokhorst.xprivacy"
     android:installLocation="internalOnly"
-    android:versionCode="476"
-    android:versionName="3.6.14" >
+    android:versionCode="477"
+    android:versionName="3.6.15" >
 
     <uses-sdk
         android:minSdkVersion="15"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,10 @@ Changelog
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
+**Version 3.6.15 BETA**
+
+* Fixed privacy service not running with older Xposed releases ([issue](/../../issues/2206))
+
 **Version 3.6.14 BETA**
 
 * Fixed on demand restricting for some custom ROMs (OPPO)

diff --git a/src/biz/bokhorst/xprivacy/ActivitySettings.java b/src/biz/bokhorst/xprivacy/ActivitySettings.java
@@ -13,7 +13,6 @@
 import android.content.Intent;
 import android.location.Address;
 import android.location.Geocoder;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Process;
@@ -283,7 +282,7 @@ protected void onCreate(Bundle savedInstanceState) {
 			}
 			cbExpert.setChecked(expert);
 
-			if (PrivacyManager.cVersion3 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+			if (PrivacyManager.cVersion3 && !Util.isSELinuxEnforced())
 				cbAOSP.setVisibility(View.VISIBLE);
 
 			if (expert) {

diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java
@@ -84,8 +84,8 @@ public class PrivacyService extends IPrivacyService.Stub {
 	private static final String cTableUsage = "usage";
 	private static final String cTableSetting = "setting";
 
-	private static final int cCurrentVersion = 476;
-	private static final String cServiceName = "xprivacy476";
+	private static final int cCurrentVersion = 477;
+	private static final String cServiceName = "xprivacy477";
 
 	private boolean mCorrupt = false;
 	private boolean mNotified = false;

diff --git a/src/biz/bokhorst/xprivacy/Util.java b/src/biz/bokhorst/xprivacy/Util.java
@@ -438,6 +438,17 @@ public static boolean hasLBE() {
 		return mHasLBE;
 	}
 
+	public static boolean isSELinuxEnforced() {
+		try {
+			Class<?> cSELinux = Class.forName("android.os.SELinux");
+			if ((Boolean) cSELinux.getDeclaredMethod("isSELinuxEnabled").invoke(null))
+				if ((Boolean) cSELinux.getDeclaredMethod("isSELinuxEnforced").invoke(null))
+					return true;
+		} catch (Throwable t) {
+		}
+		return false;
+	}
+
 	public static int getSelfVersionCode(Context context) {
 		try {
 			String self = Util.class.getPackage().getName();

diff --git a/src/biz/bokhorst/xprivacy/XPrivacy.java b/src/biz/bokhorst/xprivacy/XPrivacy.java
@@ -19,7 +19,6 @@
 import android.util.Log;
 import de.robv.android.xposed.IXposedHookZygoteInit;
 import de.robv.android.xposed.IXposedHookLoadPackage;
-import de.robv.android.xposed.SELinuxHelper;
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam;
 import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XC_MethodHook;
@@ -43,7 +42,7 @@ public void initZygote(StartupParam startupParam) throws Throwable {
 		mSecret = Long.toHexString(new Random().nextLong());
 
 		// Reading files with SELinux enabled can result in bootloops
-		boolean selinux = (SELinuxHelper.isSELinuxEnabled() && SELinuxHelper.isSELinuxEnforced());
+		boolean selinux = Util.isSELinuxEnforced();
 
 		// Read list of disabled hooks
 		if (mListDisabled.size() == 0 && !selinux) {