Display and control your Android device
Do not crash on missing clipboard manager
Romain Vimontf7d4b6d0db0f
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.javaindex 349486c3..14495736 100644--- a/server/src/main/java/com/genymobile/scrcpy/Device.java+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java@@ -1,5 +1,6 @@package com.genymobile.scrcpy;+import com.genymobile.scrcpy.wrappers.ClipboardManager;import com.genymobile.scrcpy.wrappers.ContentProvider;import com.genymobile.scrcpy.wrappers.InputManager;import com.genymobile.scrcpy.wrappers.ServiceManager;@@ -80,23 +81,28 @@ public final class Device {if (options.getControl()) {// If control is enabled, synchronize Android clipboard to the computer automatically- serviceManager.getClipboardManager().addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {- @Override- public void dispatchPrimaryClipChanged() {- if (isSettingClipboard.get()) {- // This is a notification for the change we are currently applying, ignore it- return;- }- synchronized (Device.this) {- if (clipboardListener != null) {- String text = getClipboardText();- if (text != null) {- clipboardListener.onClipboardTextChanged(text);+ ClipboardManager clipboardManager = serviceManager.getClipboardManager();+ if (clipboardManager != null) {+ clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {+ @Override+ public void dispatchPrimaryClipChanged() {+ if (isSettingClipboard.get()) {+ // This is a notification for the change we are currently applying, ignore it+ return;+ }+ synchronized (Device.this) {+ if (clipboardListener != null) {+ String text = getClipboardText();+ if (text != null) {+ clipboardListener.onClipboardTextChanged(text);+ }}}}- }- });+ });+ } else {+ Ln.w("No clipboard manager, copy-paste between device and computer will not work");+ }}if ((displayInfoFlags & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {@@ -199,7 +205,11 @@ public final class Device {}public String getClipboardText() {- CharSequence s = serviceManager.getClipboardManager().getText();+ ClipboardManager clipboardManager = serviceManager.getClipboardManager();+ if (clipboardManager == null) {+ return null;+ }+ CharSequence s = clipboardManager.getText();if (s == null) {return null;}@@ -207,8 +217,12 @@ public final class Device {}public boolean setClipboardText(String text) {+ ClipboardManager clipboardManager = serviceManager.getClipboardManager();+ if (clipboardManager == null) {+ return false;+ }isSettingClipboard.set(true);- boolean ok = serviceManager.getClipboardManager().setText(text);+ boolean ok = clipboardManager.setText(text);isSettingClipboard.set(false);return ok;}diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.javaindex c4ce59c2..6f4b9c04 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java@@ -77,7 +77,14 @@ public final class ServiceManager {public ClipboardManager getClipboardManager() {if (clipboardManager == null) {- clipboardManager = new ClipboardManager(getService("clipboard", "android.content.IClipboard"));+ IInterface clipboard = getService("clipboard", "android.content.IClipboard");+ if (clipboard == null) {+ // Some devices have no clipboard manager+ // <https://github.com/Genymobile/scrcpy/issues/1440>+ // <https://github.com/Genymobile/scrcpy/issues/1556>+ return null;+ }+ clipboardManager = new ClipboardManager(clipboard);}return clipboardManager;}