PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Guang Zhu
2015-05-19 18:14:45 +00:00
committed by Android (Google) Code Review
parent e74fdb8d67 72aa537980
commit ccfbb1d6ca
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
View File

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