Multi-user fixes

refs #357
M66B · Dec 26, 2013 · 88129e5 · 88129e5
1 parent 6171aa1
commit 88129e5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java
@@ -396,14 +396,17 @@ public static boolean getRestricted(XHook hook, int uid, String permission) {
 	public static final int LAST_SHARED_APPLICATION_GID = 59999;
 
 	public static boolean isApplication(int uid) {
+		uid = Util.getAppId(uid);
 		return (uid >= Process.FIRST_APPLICATION_UID && uid <= Process.LAST_APPLICATION_UID);
 	}
 
 	public static boolean isShared(int uid) {
+		uid = Util.getAppId(uid);
 		return (uid >= FIRST_SHARED_APPLICATION_GID && uid <= LAST_SHARED_APPLICATION_GID);
 	}
 
 	public static boolean isIsolated(int uid) {
+		uid = Util.getAppId(uid);
 		return (uid >= FIRST_ISOLATED_UID && uid <= LAST_ISOLATED_UID);
 	}
 
@@ -417,7 +420,7 @@ private static boolean isProviderUsable(Context context) {
 		if (isIsolated(Process.myUid()))
 			return false;
 
-		if (Process.myUid() == cAndroidUid)
+		if (Util.getAppId(Process.myUid()) == cAndroidUid)
 			if (!PrivacyManager.getSettingBool(null, null, 0, PrivacyManager.cSettingAndroidUsage, false, false))
 				return false;
 

diff --git a/src/biz/bokhorst/xprivacy/PrivacyProvider.java b/src/biz/bokhorst/xprivacy/PrivacyProvider.java
@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -26,9 +25,7 @@
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Binder;
-import android.os.Build;
 import android.os.Process;
-import android.os.UserHandle;
 import android.util.Log;
 
 @SuppressWarnings("deprecation")
@@ -514,17 +511,8 @@ public static void flush() {
 
 	// Helper methods
 
-	@SuppressLint("NewApi")
 	private void enforcePermission() throws SecurityException {
-		// UserHandle: public static final int getAppId(int uid)
-		int uid = Binder.getCallingUid();
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
-			try {
-				Method method = (Method) UserHandle.class.getDeclaredMethod("getAppId", int.class);
-				uid = (Integer) method.invoke(null, uid);
-			} catch (Throwable ex) {
-				Util.bug(null, ex);
-			}
+		int uid = Util.getAppId(Binder.getCallingUid());
 		if (uid != Process.myUid())
 			throw new SecurityException();
 	}

diff --git a/src/biz/bokhorst/xprivacy/Util.java b/src/biz/bokhorst/xprivacy/Util.java
@@ -148,19 +148,36 @@ public static String hasProLicense(Context context) {
 	}
 
 	@SuppressLint("NewApi")
-	public static String getUserDataDirectory() {
-		// UserHandle: public static final int getUserId(int uid)
+	public static int getAppId(int uid) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+			try {
+				// UserHandle: public static final int getAppId(int uid)
+				Method method = (Method) UserHandle.class.getDeclaredMethod("getAppId", int.class);
+				uid = (Integer) method.invoke(null, uid);
+			} catch (Throwable ex) {
+				Util.bug(null, ex);
+			}
+		return uid;
+	}
+
+	@SuppressLint("NewApi")
+	public static int getUserId(int uid) {
 		int userId = 0;
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
 			try {
+				// UserHandle: public static final int getUserId(int uid)
 				Method method = (Method) UserHandle.class.getDeclaredMethod("getUserId", int.class);
-				userId = (Integer) method.invoke(null, Process.myUid());
+				userId = (Integer) method.invoke(null, uid);
 			} catch (Throwable ex) {
 				Util.bug(null, ex);
 			}
+		return userId;
+	}
 
+	public static String getUserDataDirectory() {
 		// Build data directory
 		String dataDir = Environment.getDataDirectory() + File.separator;
+		int userId = getUserId(Process.myUid());
 		if (userId == 0 && Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)
 			dataDir += "data";
 		else

diff --git a/src/biz/bokhorst/xprivacy/XApplication.java b/src/biz/bokhorst/xprivacy/XApplication.java
@@ -67,7 +67,7 @@ protected void after(MethodHookParam param) throws Throwable {
 			}
 
 			// Install receiver for package management
-			if (Process.myUid() != PrivacyManager.cAndroidUid) {
+			if (Util.getAppId(Process.myUid()) != PrivacyManager.cAndroidUid) {
 				boolean experimental = PrivacyManager.getSettingBool(null, null, 0,
 						PrivacyManager.cSettingExperimental, PrivacyManager.cTestVersion, true);
 				if (experimental && !mReceiverInstalled)

diff --git a/src/biz/bokhorst/xprivacy/XIoBridge.java b/src/biz/bokhorst/xprivacy/XIoBridge.java
@@ -39,7 +39,7 @@ protected void before(MethodHookParam param) throws Throwable {
 			String fileName = (String) param.args[0];
 			if (fileName != null && (fileName.startsWith(mFileName) || mFileName.contains("..."))) {
 				// Zygote, Android
-				if (Process.myUid() <= 0 || Process.myUid() == PrivacyManager.cAndroidUid)
+				if (Process.myUid() <= 0 || Util.getAppId(Process.myUid()) == PrivacyManager.cAndroidUid)
 					return;
 
 				// /proc