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

Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: I7225161683a0b68b6eebf188ec99f39e57a33851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack Yu
2023-02-22 19:16:48 +00:00
committed by Automerger Merge Worker
parent 86a6c6a9a7 e1dfe3d417
commit 252dd209b3
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -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 */);