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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-13 22:46:21 +00:00
committed by Android (Google) Code Review
parent 5fb9348960 da3f0d9e56
commit 50fb75863e
4 changed files with 3 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@ 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;
@@ -76,10 +75,6 @@ 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,7 +29,6 @@ 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;
@@ -90,10 +89,6 @@ public class SelectUsbConfigPreferenceController extends
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (Utils.isMonkeyRunning()) {
return false;
}
writeUsbConfigurationOption(newValue.toString());
updateUsbConfigurationValues();
return true;
@@ -143,4 +138,5 @@ public class SelectUsbConfigPreferenceController extends
setCurrentFunction(newValue, true);
}
}
}