[VA]: fix exception on samsung Oreo.

android-hacker · Mar 20, 2018 · d334cb4 · d334cb4
1 parent 5ce98f9
commit d334cb4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/...alApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/clipboard/ClipBoardStub.java b/...alApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/clipboard/ClipBoardStub.java
@@ -8,6 +8,7 @@
 import com.lody.virtual.client.hook.base.BinderInvocationProxy;
 import com.lody.virtual.client.hook.base.ReplaceLastPkgMethodProxy;
 import com.lody.virtual.helper.compat.BuildCompat;
+import com.lody.virtual.helper.utils.DeviceUtil;
 
 import mirror.android.content.ClipboardManager;
 import mirror.android.content.ClipboardManagerOreo;
@@ -23,7 +24,7 @@ public ClipBoardStub() {
     }
 
     private static IInterface getInterface() {
-        if (BuildCompat.isOreo() || ClipboardManager.getService == null) {
+        if (isOreo()) {
             android.content.ClipboardManager cm = (android.content.ClipboardManager)
                     VirtualCore.get().getContext().getSystemService(Context.CLIPBOARD_SERVICE);
             return ClipboardManagerOreo.mService.get(cm);
@@ -49,12 +50,18 @@ protected void onBindMethods() {
     @Override
     public void inject() throws Throwable {
         super.inject();
-        if (BuildCompat.isOreo()) {
+        if (isOreo()) {
             android.content.ClipboardManager cm = (android.content.ClipboardManager)
                     VirtualCore.get().getContext().getSystemService(Context.CLIPBOARD_SERVICE);
             ClipboardManagerOreo.mService.set(cm, getInvocationStub().getProxyInterface());
         } else {
             ClipboardManager.sService.set(getInvocationStub().getProxyInterface());
         }
     }
+
+    private static boolean isOreo() {
+        return BuildCompat.isOreo() &&
+                !DeviceUtil.isSamsung()
+                || ClipboardManager.getService == null;
+    }
 }
diff --git a/.../main/java/com/lody/virtual/client/hook/proxies/notification/NotificationManagerStub.java b/.../main/java/com/lody/virtual/client/hook/proxies/notification/NotificationManagerStub.java
@@ -7,6 +7,7 @@
 import com.lody.virtual.client.hook.base.MethodInvocationProxy;
 import com.lody.virtual.client.hook.base.MethodInvocationStub;
 import com.lody.virtual.client.hook.base.ReplaceCallingPkgMethodProxy;
+import com.lody.virtual.helper.utils.DeviceUtil;
 
 import mirror.android.app.NotificationManager;
 import mirror.android.widget.Toast;
@@ -47,7 +48,7 @@ protected void onBindMethods() {
             addMethodProxy(new ReplaceCallingPkgMethodProxy("getNotificationChannel"));
             addMethodProxy(new ReplaceCallingPkgMethodProxy("deleteNotificationChannel"));
         }
-        if ("samsung".equalsIgnoreCase(Build.BRAND) || "samsung".equalsIgnoreCase(Build.MANUFACTURER)) {
+        if (DeviceUtil.isSamsung()) {
             addMethodProxy(new ReplaceCallingPkgMethodProxy("removeEdgeNotification"));
         }
     }

diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/helper/utils/DeviceUtil.java b/VirtualApp/lib/src/main/java/com/lody/virtual/helper/utils/DeviceUtil.java
@@ -18,4 +18,8 @@ public static boolean isMeizuBelowN() {
         String display = Build.DISPLAY;
         return display.toLowerCase().contains("flyme");
     }
+
+    public static boolean isSamsung() {
+        return "samsung".equalsIgnoreCase(Build.BRAND) || "samsung".equalsIgnoreCase(Build.MANUFACTURER);
+    }
 }