Skip to content

Display and control your Android device

Do not log success on failure

Romain Vimontbea1c11f8ed7
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.java
index 64d77de3..cbe294af 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -163,8 +163,10 @@ public final class Device {
}
public void setClipboardText(String text) {
- serviceManager.getClipboardManager().setText(text);
- Ln.i("Device clipboard set");
+ boolean ok = serviceManager.getClipboardManager().setText(text);
+ if (ok) {
+ Ln.i("Device clipboard set");
+ }
}
/**
@@ -176,8 +178,10 @@ public final class Device {
Ln.e("Could not get built-in display");
return;
}
- SurfaceControl.setDisplayPowerMode(d, mode);
- Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
+ boolean ok = SurfaceControl.setDisplayPowerMode(d, mode);
+ if (ok) {
+ Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
+ }
}
/**
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
index 592bdf6b..ade23032 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
@@ -74,13 +74,15 @@ public class ClipboardManager {
}
}
- public void setText(CharSequence text) {
+ public boolean setText(CharSequence text) {
try {
Method method = getSetPrimaryClipMethod();
ClipData clipData = ClipData.newPlainText(null, text);
setPrimaryClip(method, manager, clipData);
+ return true;
} catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
Ln.e("Could not invoke method", e);
+ return false;
}
}
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
index 227bbc85..8fbb860b 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
@@ -121,12 +121,14 @@ public final class SurfaceControl {
return setDisplayPowerModeMethod;
}
- public static void setDisplayPowerMode(IBinder displayToken, int mode) {
+ public static boolean setDisplayPowerMode(IBinder displayToken, int mode) {
try {
Method method = getSetDisplayPowerModeMethod();
method.invoke(null, displayToken, mode);
+ return true;
} catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
Ln.e("Could not invoke method", e);
+ return false;
}
}