FIX getDeviceIdWithFeature

Signed-off-by: tiann <[email protected]>

Author: tiann

VirtualApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/telephony/TelephonyStub.java

@@ -1,12 +1,20 @@
 package com.lody.virtual.client.hook.proxies.telephony;
 
+import android.Manifest;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
 
-import com.lody.virtual.client.hook.base.Inject;
+import com.lody.virtual.client.VClientImpl;
+import com.lody.virtual.client.core.VirtualCore;
 import com.lody.virtual.client.hook.base.BinderInvocationProxy;
+import com.lody.virtual.client.hook.base.Inject;
 import com.lody.virtual.client.hook.base.ReplaceCallingPkgMethodProxy;
 import com.lody.virtual.client.hook.base.ReplaceLastPkgMethodProxy;
 
+import java.lang.reflect.Method;
+
 import mirror.com.android.internal.telephony.ITelephony;
 
 /**
@@ -51,5 +59,28 @@ protected void onBindMethods() {
 		addMethodProxy(new ReplaceCallingPkgMethodProxy("getMergedSubscriberIds"));
 		addMethodProxy(new ReplaceLastPkgMethodProxy("getRadioAccessFamily"));
 		addMethodProxy(new ReplaceCallingPkgMethodProxy("isVideoCallingEnabled"));
+
+		addMethodProxy(new ReplaceCallingPkgMethodProxy("getDeviceIdWithFeature") {
+			@Override
+			public Object call(Object who, Method method, Object... args) throws Throwable{
+				try {
+					return super.call(who, method, args);
+				} catch (SecurityException e) {
+					ApplicationInfo ai = VClientImpl.get().getCurrentApplicationInfo();
+					if (ai.targetSdkVersion >= 29) {
+						throw e;
+					}
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+						Context context = VirtualCore.get().getContext();
+						if (context.checkSelfPermission(Manifest.permission.READ_PHONE_STATE)
+								!= PackageManager.PERMISSION_GRANTED) {
+							// 不排除不检查权限直接使用 try-catch 判断的情况
+							throw e;
+						}
+					}
+					return null;
+				}
+			}
+		});
 	}
 }