Skip to content

Display and control your Android device

Make Device methods static when possible

Romain Vimont0c5e0a4f6d30
diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java
index 9100a9db..79feefc1 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -54,7 +54,7 @@ public class Controller {
public void control() throws IOException {
// on start, power on the device
- if (!device.isScreenOn()) {
+ if (!Device.isScreenOn()) {
device.injectKeycode(KeyEvent.KEYCODE_POWER);
// dirty hack
@@ -105,13 +105,13 @@ public class Controller {
}
break;
case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
- device.expandNotificationPanel();
+ Device.expandNotificationPanel();
break;
case ControlMessage.TYPE_COLLAPSE_NOTIFICATION_PANEL:
- device.collapsePanels();
+ Device.collapsePanels();
break;
case ControlMessage.TYPE_GET_CLIPBOARD:
- String clipboardText = device.getClipboardText();
+ String clipboardText = Device.getClipboardText();
if (clipboardText != null) {
sender.pushClipboardText(clipboardText);
}
@@ -130,7 +130,7 @@ public class Controller {
}
break;
case ControlMessage.TYPE_ROTATE_DEVICE:
- device.rotateDevice();
+ Device.rotateDevice();
break;
default:
// do nothing
@@ -248,7 +248,7 @@ public class Controller {
}
private boolean pressBackOrTurnScreenOn() {
- int keycode = device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
+ int keycode = Device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
if (keepPowerModeOff && keycode == KeyEvent.KEYCODE_POWER) {
schedulePowerModeOff();
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.java
index f23dd056..a8fdf677 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -25,6 +25,8 @@ public final class Device {
public static final int POWER_MODE_OFF = SurfaceControl.POWER_MODE_OFF;
public static final int POWER_MODE_NORMAL = SurfaceControl.POWER_MODE_NORMAL;
+ private static final ServiceManager SERVICE_MANAGER = new ServiceManager();
+
public interface RotationListener {
void onRotationChanged(int rotation);
}
@@ -33,8 +35,6 @@ public final class Device {
void onClipboardTextChanged(String text);
}
- private final ServiceManager serviceManager = new ServiceManager();
-
private ScreenInfo screenInfo;
private RotationListener rotationListener;
private ClipboardListener clipboardListener;
@@ -54,9 +54,9 @@ public final class Device {
public Device(Options options) {
displayId = options.getDisplayId();
- DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo(displayId);
+ DisplayInfo displayInfo = SERVICE_MANAGER.getDisplayManager().getDisplayInfo(displayId);
if (displayInfo == null) {
- int[] displayIds = serviceManager.getDisplayManager().getDisplayIds();
+ int[] displayIds = SERVICE_MANAGER.getDisplayManager().getDisplayIds();
throw new InvalidDisplayIdException(displayId, displayIds);
}
@@ -65,7 +65,7 @@ public final class Device {
screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation());
layerStack = displayInfo.getLayerStack();
- serviceManager.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
+ SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
@Override
public void onRotationChanged(int rotation) {
synchronized (Device.this) {
@@ -81,7 +81,7 @@ public final class Device {
if (options.getControl()) {
// If control is enabled, synchronize Android clipboard to the computer automatically
- ClipboardManager clipboardManager = serviceManager.getClipboardManager();
+ ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
if (clipboardManager != null) {
clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
@Override
@@ -166,7 +166,7 @@ public final class Device {
return false;
}
- return serviceManager.getInputManager().injectInputEvent(inputEvent, mode);
+ return SERVICE_MANAGER.getInputManager().injectInputEvent(inputEvent, mode);
}
public boolean injectEvent(InputEvent event) {
@@ -184,8 +184,8 @@ public final class Device {
return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
}
- public boolean isScreenOn() {
- return serviceManager.getPowerManager().isScreenOn();
+ public static boolean isScreenOn() {
+ return SERVICE_MANAGER.getPowerManager().isScreenOn();
}
public synchronized void setRotationListener(RotationListener rotationListener) {
@@ -196,16 +196,16 @@ public final class Device {
this.clipboardListener = clipboardListener;
}
- public void expandNotificationPanel() {
- serviceManager.getStatusBarManager().expandNotificationsPanel();
+ public static void expandNotificationPanel() {
+ SERVICE_MANAGER.getStatusBarManager().expandNotificationsPanel();
}
- public void collapsePanels() {
- serviceManager.getStatusBarManager().collapsePanels();
+ public static void collapsePanels() {
+ SERVICE_MANAGER.getStatusBarManager().collapsePanels();
}
- public String getClipboardText() {
- ClipboardManager clipboardManager = serviceManager.getClipboardManager();
+ public static String getClipboardText() {
+ ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
if (clipboardManager == null) {
return null;
}
@@ -217,7 +217,7 @@ public final class Device {
}
public boolean setClipboardText(String text) {
- ClipboardManager clipboardManager = serviceManager.getClipboardManager();
+ ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
if (clipboardManager == null) {
return false;
}
@@ -252,8 +252,8 @@ public final class Device {
/**
* Disable auto-rotation (if enabled), set the screen rotation and re-enable auto-rotation (if it was enabled).
*/
- public void rotateDevice() {
- WindowManager wm = serviceManager.getWindowManager();
+ public static void rotateDevice() {
+ WindowManager wm = SERVICE_MANAGER.getWindowManager();
boolean accelerometerRotation = !wm.isRotationFrozen();
@@ -270,7 +270,7 @@ public final class Device {
}
}
- public ContentProvider createSettingsProvider() {
- return serviceManager.getActivityManager().createSettingsProvider();
+ public static ContentProvider createSettingsProvider() {
+ return SERVICE_MANAGER.getActivityManager().createSettingsProvider();
}
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index d257e319..9b7f9de8 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -26,7 +26,7 @@ public final class Server {
boolean mustDisableShowTouchesOnCleanUp = false;
int restoreStayOn = -1;
if (options.getShowTouches() || options.getStayAwake()) {
- try (ContentProvider settings = device.createSettingsProvider()) {
+ try (ContentProvider settings = Device.createSettingsProvider()) {
if (options.getShowTouches()) {
String oldValue = settings.getAndPutValue(ContentProvider.TABLE_SYSTEM, "show_touches", "1");
// If "show touches" was disabled, it must be disabled back on clean up