Merge "Don't set USB mode if user is a monkey"

This commit is contained in:
TreeHugger Robot
2018-02-14 02:35:10 +00:00
committed by Android (Google) Code Review
2 changed files with 18 additions and 1 deletions

View File

@@ -17,6 +17,8 @@
package com.android.settings.connecteddevice.usb;
import com.android.settings.R;
import com.android.settings.Utils;
import android.content.Context;
import android.hardware.usb.UsbManager;
import android.support.v14.preference.PreferenceFragment;
@@ -136,10 +138,17 @@ public class UsbDetailsProfilesController extends UsbDetailsController
} else {
mode &= ~thisMode;
}
mUsbBackend.setMode(mode);
if (!Utils.isMonkeyRunning()) {
mUsbBackend.setMode(mode);
}
return false;
}
@Override
public boolean isAvailable() {
return !Utils.isMonkeyRunning();
}
@Override
public String getPreferenceKey() {
return mKey;