Fixed (telephony) restrictions for Android versions before Lollipop

Closes #2202
M66B · May 25, 2015 · 0fb1c77 · 0fb1c77
1 parent 2d11daa
commit 0fb1c77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ Changelog
 **Next release**
 
 * Fixed on demand restricting for some custom ROMs (OPPO)
+* Fixed (telephony) restrictions for Android versions before Lollipop ([issue](/../../issues/2202))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 

diff --git a/src/biz/bokhorst/xprivacy/XPrivacy.java b/src/biz/bokhorst/xprivacy/XPrivacy.java
@@ -115,7 +115,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 								@Override
 								protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 									PrivacyService.register(mListHookError, loader, mSecret, param.thisObject);
-									hookSystem(param.thisObject, loader);
+									hookSystem(loader);
 								}
 							});
 						} catch (Throwable ex) {
@@ -130,12 +130,13 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 					@Override
 					protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 						PrivacyService.register(mListHookError, null, mSecret, param.thisObject);
-						hookSystem(param.thisObject, null);
 					}
 				});
 			}
 
 			hookZygote();
+			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
+				hookSystem(null);
 
 		} catch (Throwable ex) {
 			Util.bug(null, ex);
@@ -291,7 +292,7 @@ private void hookZygote() throws Throwable {
 		hookAll(XActivity.getInstances(), null, mSecret, false);
 	}
 
-	private void hookSystem(Object am, ClassLoader classLoader) throws Throwable {
+	private void hookSystem(ClassLoader classLoader) throws Throwable {
 		Log.w("XPrivacy", "Hooking system");
 
 		/*