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

Merge "Revert "Development Options: toggle binderized hals""

Browse Source
This commit is contained in:
Treehugger Robot
2017-03-28 01:12:13 +00:00
committed by Gerrit Code Review
parent fb81f50c27 544c820ac7
commit 21de66bc0c
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/DevelopmentSettings.java
View File

@@ -226,8 +226,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
private static final String ENABLE_HAL_BINDERIZATION_KEY = "enable_hal_binderization";
private static final String ENABLE_HAL_BINDERIZATION_PROPERTY = "persist.hal.binderization";
private static final int RESULT_DEBUG_APP = 1000;
private static final int RESULT_MOCK_LOCATION_APP = 1001;
@@ -291,7 +289,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private ListPreference mBluetoothSelectA2dpLdacPlaybackQuality;
private SwitchPreference mOtaDisableAutomaticUpdate;
private SwitchPreference mEnableHalBinderization;
private SwitchPreference mWifiAllowScansWithTraffic;
private SwitchPreference mStrictMode;
private SwitchPreference mPointerLocation;
@@ -531,8 +528,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mOtaDisableAutomaticUpdate = findAndInitSwitchPref(OTA_DISABLE_AUTOMATIC_UPDATE_KEY);
mEnableHalBinderization = findAndInitSwitchPref(ENABLE_HAL_BINDERIZATION_KEY);
mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
mColorModePreference.updateCurrentAndSupported();
if (mColorModePreference.getColorModeCount() < 2) {
@@ -762,7 +757,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateShowAllANRsOptions();
updateVerifyAppsOverUsbOptions();
updateOtaDisableAutomaticUpdateOptions();
updateEnableHalBinderizationOptions();
updateBugreportOptions();
updateForceRtlOptions();
updateLogdSizeValues();
@@ -1052,17 +1046,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mOtaDisableAutomaticUpdate.isChecked() ? 0 : 1);
}
private void updateEnableHalBinderizationOptions() {
updateSwitchPreference(mEnableHalBinderization,
SystemProperties.getBoolean(ENABLE_HAL_BINDERIZATION_PROPERTY, false));
}
private void writeEnableHalBinderizationOptions() {
SystemProperties.set(ENABLE_HAL_BINDERIZATION_PROPERTY,
mEnableHalBinderization.isChecked() ? "true" : "false");
pokeSystemProperties();
}
private boolean enableVerifierSetting() {
final ContentResolver cr = getActivity().getContentResolver();
if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) == 0) {
@@ -2466,8 +2449,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
writeVerifyAppsOverUsbOptions();
} else if (preference == mOtaDisableAutomaticUpdate) {
writeOtaDisableAutomaticUpdateOptions();
} else if (preference == mEnableHalBinderization) {
writeEnableHalBinderizationOptions();
} else if (preference == mStrictMode) {
writeStrictModeVisualOptions();
} else if (preference == mPointerLocation) {