Display and control your Android device
Use ROOT_UID from FakeContext
Romain Vimont42285ae86906
diff --git a/server/src/main/java/com/genymobile/scrcpy/FakeContext.java b/server/src/main/java/com/genymobile/scrcpy/FakeContext.javaindex ddd6177b..844d6bd8 100644--- a/server/src/main/java/com/genymobile/scrcpy/FakeContext.java+++ b/server/src/main/java/com/genymobile/scrcpy/FakeContext.java@@ -9,6 +9,7 @@ import android.os.Process;public final class FakeContext extends ContextWrapper {public static final String PACKAGE_NAME = "com.android.shell";+ public static final int ROOT_UID = 0; // Like android.os.Process.ROOT_UID, but before API 29private static final FakeContext INSTANCE = new FakeContext();diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.javaindex 93ed4528..76aab5f1 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java@@ -1,5 +1,6 @@package com.genymobile.scrcpy.wrappers;+import com.genymobile.scrcpy.FakeContext;import com.genymobile.scrcpy.Ln;import android.os.Binder;@@ -48,10 +49,10 @@ public class ActivityManager {Object[] args;if (getContentProviderExternalMethodNewVersion) {// new version- args = new Object[]{name, ServiceManager.USER_ID, token, null};+ args = new Object[]{name, FakeContext.ROOT_UID, token, null};} else {// old version- args = new Object[]{name, ServiceManager.USER_ID, token};+ args = new Object[]{name, FakeContext.ROOT_UID, token};}// ContentProviderHolder providerHolder = getContentProviderExternal(...);Object providerHolder = method.invoke(manager, args);diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.javaindex e0af7923..0c1777ec 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java@@ -62,9 +62,9 @@ public class ClipboardManager {return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME);}if (alternativeMethod) {- return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);+ return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID);}- return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);+ return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, FakeContext.ROOT_UID);}private static void setPrimaryClip(Method method, boolean alternativeMethod, IInterface manager, ClipData clipData)@@ -72,9 +72,9 @@ public class ClipboardManager {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {method.invoke(manager, clipData, FakeContext.PACKAGE_NAME);} else if (alternativeMethod) {- method.invoke(manager, clipData, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);+ method.invoke(manager, clipData, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID);} else {- method.invoke(manager, clipData, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);+ method.invoke(manager, clipData, FakeContext.PACKAGE_NAME, FakeContext.ROOT_UID);}}@@ -109,9 +109,9 @@ public class ClipboardManager {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {method.invoke(manager, listener, FakeContext.PACKAGE_NAME);} else if (alternativeMethod) {- method.invoke(manager, listener, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);+ method.invoke(manager, listener, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID);} else {- method.invoke(manager, listener, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);+ method.invoke(manager, listener, FakeContext.PACKAGE_NAME, FakeContext.ROOT_UID);}}diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.javaindex 2bdbe175..4917f5eb 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java@@ -138,7 +138,7 @@ public class ContentProvider implements Closeable {public String getValue(String table, String key) throws SettingsException {String method = getGetMethod(table);Bundle arg = new Bundle();- arg.putInt(CALL_METHOD_USER_KEY, ServiceManager.USER_ID);+ arg.putInt(CALL_METHOD_USER_KEY, FakeContext.ROOT_UID);try {Bundle bundle = call(method, key, arg);if (bundle == null) {@@ -154,7 +154,7 @@ public class ContentProvider implements Closeable {public void putValue(String table, String key, String value) throws SettingsException {String method = getPutMethod(table);Bundle arg = new Bundle();- arg.putInt(CALL_METHOD_USER_KEY, ServiceManager.USER_ID);+ arg.putInt(CALL_METHOD_USER_KEY, FakeContext.ROOT_UID);arg.putString(NAME_VALUE_TABLE_VALUE, value);try {call(method, key, arg);diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.javaindex ff4b5e23..ee2f0fa9 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java@@ -10,8 +10,6 @@ import java.lang.reflect.Method;@SuppressLint("PrivateApi,DiscouragedPrivateApi")public final class ServiceManager {- public static final int USER_ID = 0;-private static final Method GET_SERVICE_METHOD;static {try {