Prevent monkey from changing usb settings

- Prevent monkey from revoking usb debugging authorizations
 - Prevent monkey from changing usb configurations

Bug: 68707778
Test: make RunSettingsRoboTests -j40
Change-Id: Idce99d60f0fbce5a9d93aceb0c2a07d27482de10
This commit is contained in:
jeffreyhuang
2017-11-06 16:51:27 -08:00
parent d723394569
commit 7b17780134
4 changed files with 52 additions and 3 deletions

View File

@@ -29,6 +29,7 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -89,6 +90,10 @@ public class SelectUsbConfigPreferenceController extends
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (Utils.isMonkeyRunning()) {
return false;
}
writeUsbConfigurationOption(newValue.toString());
updateUsbConfigurationValues();
return true;
@@ -138,5 +143,4 @@ public class SelectUsbConfigPreferenceController extends
setCurrentFunction(newValue, true);
}
}
}