Show reboot dialog when users disable developer options
When NFC detailed logging mechanisms are enabled and users try to disable develoepr options, show reboot request dialog to make sure NFC logging mechanisms are also disabled. Bug: 204397062 Test: manual Change-Id: I531c85fd77934ad7821c480df07465a8cd8f24f9
This commit is contained in:
@@ -300,10 +300,19 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
|
final BluetoothLeAudioHwOffloadPreferenceController leAudioController =
|
||||||
getDevelopmentOptionsController(
|
getDevelopmentOptionsController(
|
||||||
BluetoothLeAudioHwOffloadPreferenceController.class);
|
BluetoothLeAudioHwOffloadPreferenceController.class);
|
||||||
|
final NfcSnoopLogPreferenceController nfcSnoopLogController =
|
||||||
|
getDevelopmentOptionsController(
|
||||||
|
NfcSnoopLogPreferenceController.class);
|
||||||
|
final NfcVerboseVendorLogPreferenceController nfcVerboseLogController =
|
||||||
|
getDevelopmentOptionsController(
|
||||||
|
NfcVerboseVendorLogPreferenceController.class);
|
||||||
// If hardware offload isn't default value, we must reboot after disable
|
// If hardware offload isn't default value, we must reboot after disable
|
||||||
// developer options. Show a dialog for the user to confirm.
|
// developer options. Show a dialog for the user to confirm.
|
||||||
if ((a2dpController == null || a2dpController.isDefaultValue())
|
if ((a2dpController == null || a2dpController.isDefaultValue())
|
||||||
&& (leAudioController == null || leAudioController.isDefaultValue())) {
|
&& (leAudioController == null || leAudioController.isDefaultValue())
|
||||||
|
&& (nfcSnoopLogController == null || nfcSnoopLogController.isDefaultValue())
|
||||||
|
&& (nfcVerboseLogController == null
|
||||||
|
|| nfcVerboseLogController.isDefaultValue())) {
|
||||||
disableDeveloperOptions();
|
disableDeveloperOptions();
|
||||||
} else {
|
} else {
|
||||||
DisableDevSettingsDialogFragment.show(this /* host */);
|
DisableDevSettingsDialogFragment.show(this /* host */);
|
||||||
|
Reference in New Issue
Block a user