From a519723d443441856716ed353824e8c5858b76f4 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 20 Jun 2018 01:26:59 -0700
Subject: [PATCH] Monkey-proof Moonlight

---
 app/src/main/java/com/limelight/PcView.java | 5 +++++
 moonlight-common                            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/limelight/PcView.java b/app/src/main/java/com/limelight/PcView.java
index 6ce976c6..5c7c4458 100644
--- a/app/src/main/java/com/limelight/PcView.java
+++ b/app/src/main/java/com/limelight/PcView.java
@@ -28,6 +28,7 @@ import com.limelight.utils.ShortcutHelper;
 import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -560,6 +561,10 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 return true;
 
             case DELETE_ID:
+                if (ActivityManager.isUserAMonkey()) {
+                    LimeLog.info("Ignoring delete PC request from monkey");
+                    return true;
+                }
                 if (managerBinder == null) {
                     Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
                     return true;
diff --git a/moonlight-common b/moonlight-common
index 165a518a..defd6fb1 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit 165a518adbe410a8d10e2f3712ac4b5817413924
+Subproject commit defd6fb14f56a02bf7395e30cf3ec7e205033c22