Fix am lock check

Refs #1757
M66B · Feb 15, 2015 · b805a72 · b805a72
1 parent 01a7e4f
commit b805a72
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java
@@ -70,6 +70,7 @@
 
 public class PrivacyService extends IPrivacyService.Stub {
 	private static int mXUid = -1;
+	private static Object mAm;
 	private static Context mContext;
 	private static String mSecret = null;
 	private static Thread mWorker = null;
@@ -129,6 +130,7 @@ private PrivacyService() {
 
 	public static void register(List<String> listError, ClassLoader classLoader, String secret, Object am) {
 		// Store secret and errors
+		mAm = am;
 		mSecret = secret;
 		mListError.addAll(listError);
 
@@ -2264,8 +2266,13 @@ private void enforcePermission(int uid) {
 
 	private boolean isAMLocked(int uid) {
 		try {
-			Class<?> cam = Class.forName("com.android.server.am.ActivityManagerService");
-			Object am = cam.getMethod("self").invoke(null);
+			Object am;
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+				am = mAm;
+			else {
+				Class<?> cam = Class.forName("com.android.server.am.ActivityManagerService");
+				am = cam.getMethod("self").invoke(null);
+			}
 			boolean locked = Thread.holdsLock(am);
 			if (locked) {
 				boolean freeze = getSettingBool(uid, PrivacyManager.cSettingFreeze, false);