200

app/src/main/java/com/example/modifiermodule/Hook13.java

@@ -122,17 +122,10 @@ public class Hook13 extends BaseHook {
                     param.setResult(getProperty(PROP_IMEI, ""));
                 }
             });
-            XposedHelpers.findAndHookMethod(PhoneInterfaceManager, "getDeviceIdForPhone", String.class, new XC_MethodHook() {
-                @Override
-                protected void beforeHookedMethod(MethodHookParam param) {
-                    log("spoof PhoneInterfaceManager.getDeviceId");
-                    param.setResult(getProperty(PROP_IMEI, ""));
-                }
-            });
             XposedHelpers.findAndHookMethod(PhoneInterfaceManager, "getCarrierIdFromMccMnc", int.class, String.class, boolean.class, new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                    log(String.format("PhoneInterfaceManager.getCarrierIdFromMccMnc(%d, %s, %d)", param.args[0], param.args[1]));
+                    log(String.format("PhoneInterfaceManager.getCarrierIdFromMccMnc(%d, %s, %b)", param.args[0], param.args[1], param.args[2]));
                     int carrierId = getIntProperty(PROP_CARRIER_ID, -1);
                     if (carrierId != -1) {
                         param.setResult(carrierId);
@@ -226,13 +219,6 @@ public class Hook13 extends BaseHook {
                     param.setResult(getProperty(PROP_IMSI, ""));
                 }
             });
-            XposedHelpers.findAndHookMethod(PhoneSubInfoController, "getDeviceId",   String.class, new XC_MethodHook() {
-                @Override
-                protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                    log("spoof PhoneSubInfoController.getDeviceIdForPhone");
-                    param.setResult(getProperty(PROP_IMEI, ""));
-                }
-            });
             XposedHelpers.findAndHookMethod(PhoneSubInfoController, "getDeviceIdForPhone", int.class, String.class, String.class, new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {

app/src/main/java/com/example/modifiermodule/HookSettings.java

@@ -29,8 +29,8 @@ public class HookSettings extends BaseHook {
                     int requestingUserId = (int) param.args[1];
                     String value = (String) XposedHelpers.getObjectField(param.getResult(), "value");
                     String packageName = (String) XposedHelpers.callMethod(param.getResult(), "getPackageName");
-                    log(String.format("getSecureSetting(%s, %s, %d): %s", packageName, name, requestingUserId, value));
                     if (name.equals("android_id")) {
+                        log(String.format("getSecureSetting(%s, %s, %d): %s", packageName, name, requestingUserId, value));
                         String androidId = null;
                         if (packageName != null && (packageName.contains("com.google.android.gms") || packageName.contains("com.android.vending"))) {
                             androidId = getProperty(PROP_GMS_AID, "");
@@ -53,7 +53,7 @@ public class HookSettings extends BaseHook {
                     int requestingUserId = (int) param.args[1];
                     String value = (String) XposedHelpers.getObjectField(param.getResult(), "value");
                     String packageName = (String) XposedHelpers.callMethod(param.getResult(), "getPackageName");
-                    log(String.format("getSystemSetting(%s, %s, %d): %s", packageName, name, requestingUserId, value));
+//                    log(String.format("getSystemSetting(%s, %s, %d): %s", packageName, name, requestingUserId, value));
                 }
             });
             XposedHelpers.findAndHookMethod(SettingsProvider, "getGlobalSetting", String.class, new XC_MethodHook() {
@@ -62,7 +62,7 @@ public class HookSettings extends BaseHook {
                     String name = (String) param.args[0];
                     String value = (String) XposedHelpers.getObjectField(param.getResult(), "value");
                     String packageName = (String) XposedHelpers.callMethod(param.getResult(), "getPackageName");
-                    log(String.format("getGlobalSetting(%s, %s): %s", packageName, name, value));
+//                    log(String.format("getGlobalSetting(%s, %s): %s", packageName, name, value));
                 }
             });
         } catch (Exception e) {