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

Merge "Prevent monkey from changing usb settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-07 19:37:03 +00:00
committed by Android (Google) Code Review
parent 00824b2714 7b17780134
commit 7036377d72
4 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/development/ClearAdbKeysPreferenceController.java
View File

@@ -28,6 +28,7 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -75,6 +76,10 @@ public class ClearAdbKeysPreferenceController extends
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (Utils.isMonkeyRunning()) {
return false;
}
if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
ClearAdbKeysWarningDialog.show(mFragment);
return true;

6
src/com/android/settings/development/SelectUsbConfigPreferenceController.java
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);
}
}
}