Revert "Revert "Prevent monkey from changing usb settings""

This reverts commit da3f0d9e56.

Change-Id: I6d63305e18c2b95676feb60f2526dcade951cd3f
This commit is contained in:
Jeffrey Huang
2017-11-20 18:55:26 +00:00
committed by jeffreyhuang
parent 2575d3fd45
commit 5a280667ba
4 changed files with 51 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);
}
}
}