Skip to content

Commit 31068ee

Browse files
committed
Use PACKAGE_NAME from FakeContext
Remove duplicated constant. PR #3757 <#3757>
1 parent e23366f commit 31068ee

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.genymobile.scrcpy.wrappers;
22

3+
import com.genymobile.scrcpy.FakeContext;
34
import com.genymobile.scrcpy.Ln;
45

56
import android.content.ClipData;
@@ -58,22 +59,22 @@ private Method getSetPrimaryClipMethod() throws NoSuchMethodException {
5859
private static ClipData getPrimaryClip(Method method, boolean alternativeMethod, IInterface manager)
5960
throws InvocationTargetException, IllegalAccessException {
6061
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
61-
return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME);
62+
return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME);
6263
}
6364
if (alternativeMethod) {
64-
return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);
65+
return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);
6566
}
66-
return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);
67+
return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);
6768
}
6869

6970
private static void setPrimaryClip(Method method, boolean alternativeMethod, IInterface manager, ClipData clipData)
7071
throws InvocationTargetException, IllegalAccessException {
7172
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
72-
method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME);
73+
method.invoke(manager, clipData, FakeContext.PACKAGE_NAME);
7374
} else if (alternativeMethod) {
74-
method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);
75+
method.invoke(manager, clipData, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);
7576
} else {
76-
method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);
77+
method.invoke(manager, clipData, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);
7778
}
7879
}
7980

@@ -106,11 +107,11 @@ public boolean setText(CharSequence text) {
106107
private static void addPrimaryClipChangedListener(Method method, boolean alternativeMethod, IInterface manager,
107108
IOnPrimaryClipChangedListener listener) throws InvocationTargetException, IllegalAccessException {
108109
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
109-
method.invoke(manager, listener, ServiceManager.PACKAGE_NAME);
110+
method.invoke(manager, listener, FakeContext.PACKAGE_NAME);
110111
} else if (alternativeMethod) {
111-
method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);
112+
method.invoke(manager, listener, FakeContext.PACKAGE_NAME, null, ServiceManager.USER_ID);
112113
} else {
113-
method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);
114+
method.invoke(manager, listener, FakeContext.PACKAGE_NAME, ServiceManager.USER_ID);
114115
}
115116
}
116117

server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ private Bundle call(String callMethod, String arg, Bundle extras)
8888
} else {
8989
switch (callMethodVersion) {
9090
case 1:
91-
args = new Object[]{ServiceManager.PACKAGE_NAME, null, "settings", callMethod, arg, extras};
91+
args = new Object[]{FakeContext.PACKAGE_NAME, null, "settings", callMethod, arg, extras};
9292
break;
9393
case 2:
94-
args = new Object[]{ServiceManager.PACKAGE_NAME, "settings", callMethod, arg, extras};
94+
args = new Object[]{FakeContext.PACKAGE_NAME, "settings", callMethod, arg, extras};
9595
break;
9696
default:
97-
args = new Object[]{ServiceManager.PACKAGE_NAME, callMethod, arg, extras};
97+
args = new Object[]{FakeContext.PACKAGE_NAME, callMethod, arg, extras};
9898
break;
9999
}
100100
}

server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
@SuppressLint("PrivateApi,DiscouragedPrivateApi")
1111
public final class ServiceManager {
1212

13-
public static final String PACKAGE_NAME = "com.android.shell";
1413
public static final int USER_ID = 0;
1514

1615
private static final Method GET_SERVICE_METHOD;

0 commit comments

Comments
 (0)