Add isAvailable check to devOptionsController
- This avoids the null check for PreferenceControllers where isAvailable() is not always true Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ibed8bc6a2a812355c521620d77fb571c1fd8a649
This commit is contained in:
@@ -69,12 +69,12 @@ public class BluetoothSnoopLogPreferenceController extends
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDeveloperOptionsEnabled() {
|
protected void onDeveloperOptionsSwitchEnabled() {
|
||||||
mPreference.setEnabled(true);
|
mPreference.setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDeveloperOptionsDisabled() {
|
protected void onDeveloperOptionsSwitchDisabled() {
|
||||||
SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(false));
|
SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(false));
|
||||||
mPreference.setChecked(false);
|
mPreference.setChecked(false);
|
||||||
mPreference.setEnabled(false);
|
mPreference.setEnabled(false);
|
||||||
|
@@ -54,10 +54,29 @@ public abstract class DeveloperOptionsPreferenceController extends
|
|||||||
/**
|
/**
|
||||||
* Called when developer options is enabled
|
* Called when developer options is enabled
|
||||||
*/
|
*/
|
||||||
public abstract void onDeveloperOptionsEnabled();
|
public void onDeveloperOptionsEnabled() {
|
||||||
|
if (isAvailable()) {
|
||||||
|
onDeveloperOptionsSwitchEnabled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when developer options is disabled
|
* Called when developer options is disabled
|
||||||
*/
|
*/
|
||||||
public abstract void onDeveloperOptionsDisabled();
|
public void onDeveloperOptionsDisabled() {
|
||||||
|
if (isAvailable()) {
|
||||||
|
onDeveloperOptionsSwitchDisabled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when developer options is enabled and the preference is available
|
||||||
|
*/
|
||||||
|
protected abstract void onDeveloperOptionsSwitchEnabled();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when developer options is disabled and the preference is available
|
||||||
|
*/
|
||||||
|
protected abstract void onDeveloperOptionsSwitchDisabled();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -122,12 +122,12 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDeveloperOptionsEnabled() {
|
protected void onDeveloperOptionsSwitchEnabled() {
|
||||||
handleDeveloperOptionsToggled();
|
handleDeveloperOptionsToggled();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDeveloperOptionsDisabled() {
|
protected void onDeveloperOptionsSwitchDisabled() {
|
||||||
handleDeveloperOptionsToggled();
|
handleDeveloperOptionsToggled();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,10 +143,6 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void handleDeveloperOptionsToggled() {
|
private void handleDeveloperOptionsToggled() {
|
||||||
if (mPreference == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mPreference.setEnabled(enableOemUnlockPreference());
|
mPreference.setEnabled(enableOemUnlockPreference());
|
||||||
if (mPreference.isEnabled()) {
|
if (mPreference.isEnabled()) {
|
||||||
// Check restriction, disable mEnableOemUnlock and apply policy transparency.
|
// Check restriction, disable mEnableOemUnlock and apply policy transparency.
|
||||||
|
@@ -100,19 +100,6 @@ public class StayAwakePreferenceController extends DeveloperOptionsPreferenceCon
|
|||||||
mPreference.setChecked(stayAwakeMode != SETTING_VALUE_OFF);
|
mPreference.setChecked(stayAwakeMode != SETTING_VALUE_OFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDeveloperOptionsEnabled() {
|
|
||||||
mPreference.setEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDeveloperOptionsDisabled() {
|
|
||||||
Settings.Global.putInt(mContext.getContentResolver(),
|
|
||||||
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, SETTING_VALUE_OFF);
|
|
||||||
mPreference.setChecked(false);
|
|
||||||
mPreference.setEnabled(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
if (mPreference != null) {
|
if (mPreference != null) {
|
||||||
@@ -127,6 +114,19 @@ public class StayAwakePreferenceController extends DeveloperOptionsPreferenceCon
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDeveloperOptionsSwitchEnabled() {
|
||||||
|
mPreference.setEnabled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDeveloperOptionsSwitchDisabled() {
|
||||||
|
Settings.Global.putInt(mContext.getContentResolver(),
|
||||||
|
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, SETTING_VALUE_OFF);
|
||||||
|
mPreference.setChecked(false);
|
||||||
|
mPreference.setEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
RestrictedLockUtils.EnforcedAdmin checkIfMaximumTimeToLockSetByAdmin() {
|
RestrictedLockUtils.EnforcedAdmin checkIfMaximumTimeToLockSetByAdmin() {
|
||||||
// A DeviceAdmin has specified a maximum time until the device
|
// A DeviceAdmin has specified a maximum time until the device
|
||||||
|
Reference in New Issue
Block a user