Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Log actions on the caller side

Browse source 
Some actions are exposed by the Device class, but logging success should
be done by the caller.
This commit is contained in:
Romain Vimont 2020-05-25 02:23:32 +02:00
parent 81573d81a0
commit c7a33fac36
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/src/main/java/com/genymobile/scrcpy/Controller.java
View file

@ -110,11 +110,18 @@ public class Controller {
sender.pushClipboardText(clipboardText); sender.pushClipboardText(clipboardText);
break; break;
case ControlMessage.TYPE_SET_CLIPBOARD: case ControlMessage.TYPE_SET_CLIPBOARD:
device.setClipboardText(msg.getText()); boolean setClipboardOk = device.setClipboardText(msg.getText());
if (setClipboardOk) {
Ln.i("Device clipboard set");
}
break; break;
case ControlMessage.TYPE_SET_SCREEN_POWER_MODE: case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
if (device.supportsInputEvents()) { if (device.supportsInputEvents()) {
device.setScreenPowerMode(msg.getAction()); int mode = msg.getAction();
boolean setPowerModeOk = device.setScreenPowerMode(mode);
if (setPowerModeOk) {
Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
}
} }
break; break;
case ControlMessage.TYPE_ROTATE_DEVICE: case ControlMessage.TYPE_ROTATE_DEVICE:

16
server/src/main/java/com/genymobile/scrcpy/Device.java
View file

@ -180,26 +180,20 @@ public final class Device {
return s.toString(); return s.toString();
} }
public void setClipboardText(String text) { public boolean setClipboardText(String text) {
boolean ok = serviceManager.getClipboardManager().setText(text); return serviceManager.getClipboardManager().setText(text);
if (ok) {
Ln.i("Device clipboard set");
}
} }
/** /**
* @param mode one of the {@code SCREEN_POWER_MODE_*} constants * @param mode one of the {@code SCREEN_POWER_MODE_*} constants
*/ */
public void setScreenPowerMode(int mode) { public boolean setScreenPowerMode(int mode) {
IBinder d = SurfaceControl.getBuiltInDisplay(); IBinder d = SurfaceControl.getBuiltInDisplay();
if (d == null) { if (d == null) {
Ln.e("Could not get built-in display"); Ln.e("Could not get built-in display");
return; return false;
}
boolean ok = SurfaceControl.setDisplayPowerMode(d, mode);
if (ok) {
Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
} }
return SurfaceControl.setDisplayPowerMode(d, mode);
} }
/** /**