commit ccfbb1d6ca30dd495938a6e68ca02410e7ffb6c7
author Guang Zhu <guangzhu@google.com> Tue May 19 18:14:45 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 19 18:14:48 2015 +0000
tree 9fc4aba2ecbdd9fef2174ef0341b437b543bccd9
parent e74fdb8d672a361f5a29cded65278054e1683fc6
parent 72aa5379806759fbf8f8402500b69f34eccb1956

Merge "Monkey should not be allowed to switch USB mode" into mnc-dev

src/com/android/settings/deviceinfo/UsbModeChooserActivity.java

diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index 76b2fd1..e0369d6 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -18,12 +18,14 @@
 
 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 @@
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        setCurrentFunction(which);
+                        if (!ActivityManager.isUserAMonkey()) {
+                            setCurrentFunction(which);
+                        }
                         dialog.dismiss();
                         UsbModeChooserActivity.this.finish();
                     }