Display and control your Android device
Use PACKAGE_NAME from FakeContext
Romain Vimont820189b6a6b5
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.javaindex f43a76bc..e0af7923 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java@@ -1,5 +1,6 @@package com.genymobile.scrcpy.wrappers;+import com.genymobile.scrcpy.FakeContext;import com.genymobile.scrcpy.Ln;import android.content.ClipData;@@ -58,22 +59,22 @@ public class ClipboardManager {private static ClipData getPrimaryClip(Method method, boolean alternativeMethod, IInterface manager)throws InvocationTargetException, IllegalAccessException {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {- return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME);+ return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME);}if (alternativeMethod) {- return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);+ return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);}- return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);+ return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);}private static void setPrimaryClip(Method method, boolean alternativeMethod, IInterface manager, ClipData clipData)throws InvocationTargetException, IllegalAccessException {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {- method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME);+ method.invoke(manager, clipData, FakeContext.PACKAGE_NAME);} else if (alternativeMethod) {- method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);+ method.invoke(manager, clipData, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);} else {- method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);+ method.invoke(manager, clipData, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);}}@@ -106,11 +107,11 @@ public class ClipboardManager {private static void addPrimaryClipChangedListener(Method method, boolean alternativeMethod, IInterface manager,IOnPrimaryClipChangedListener listener) throws InvocationTargetException, IllegalAccessException {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {- method.invoke(manager, listener, ServiceManager.PACKAGE_NAME);+ method.invoke(manager, listener, FakeContext.PACKAGE_NAME);} else if (alternativeMethod) {- method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);+ method.invoke(manager, listener, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);} else {- method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);+ method.invoke(manager, listener, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);}}diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.javaindex 854d4136..2bdbe175 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java@@ -88,13 +88,13 @@ public class ContentProvider implements Closeable {} else {switch (callMethodVersion) {case 1:- args = new Object[]{ServiceManager.PACKAGE_NAME, null, "settings", callMethod, arg, extras};+ args = new Object[]{FakeContext.PACKAGE_NAME, null, "settings", callMethod, arg, extras};break;case 2:- args = new Object[]{ServiceManager.PACKAGE_NAME, "settings", callMethod, arg, extras};+ args = new Object[]{FakeContext.PACKAGE_NAME, "settings", callMethod, arg, extras};break;default:- args = new Object[]{ServiceManager.PACKAGE_NAME, callMethod, arg, extras};+ args = new Object[]{FakeContext.PACKAGE_NAME, callMethod, arg, extras};break;}}diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.javaindex cb6863b6..ff4b5e23 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java@@ -10,7 +10,6 @@ import java.lang.reflect.Method;@SuppressLint("PrivateApi,DiscouragedPrivateApi")public final class ServiceManager {- public static final String PACKAGE_NAME = "com.android.shell";public static final int USER_ID = 0;private static final Method GET_SERVICE_METHOD;