From 72aa5379806759fbf8f8402500b69f34eccb1956 Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Tue, 19 May 2015 11:08:39 -0700
Subject: [PATCH] Monkey should not be allowed to switch USB mode

Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62
---
 .../android/settings/deviceinfo/UsbModeChooserActivity.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index 76b2fd1900d..e0369d620a2 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -18,12 +18,14 @@ package com.android.settings.deviceinfo;
 
 import android.annotation.Nullable;
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
 import android.util.Log;
+
 import com.android.settings.R;
 
 /**
@@ -46,7 +48,9 @@ public class UsbModeChooserActivity extends Activity {
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        setCurrentFunction(which);
+                        if (!ActivityManager.isUserAMonkey()) {
+                            setCurrentFunction(which);
+                        }
                         dialog.dismiss();
                         UsbModeChooserActivity.this.finish();
                     }