Show reboot dialog when users disable developer options am: d91e7a0565
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204 Change-Id: If1a8b237f58bcbb1c07a27b054be09a7530922f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -302,10 +302,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