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

Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91

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

Change-Id: I3c138106ebdaaf6b5597c6a79054915a04098117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jakub Rotkiewicz
2023-02-13 13:35:37 +00:00
committed by Automerger Merge Worker
parent 016f304b8d cfde422f91
commit bd2f353f8b
17 changed files with 1187 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
implements OnMainSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
AdbClearKeysDialogHost, LogPersistDialogHost,
BluetoothRebootDialog.OnRebootDialogListener,
AbstractBluetoothPreferenceController.Callback {
AbstractBluetoothPreferenceController.Callback, BluetoothSnoopLogHost {
private static final String TAG = "DevSettingsDashboard";
@@ -398,6 +398,18 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
leAudioFeatureController.onRebootDialogCanceled();
}
@Override
public void onSettingChanged() {
final BluetoothSnoopLogFilterProfileMapPreferenceController controllerMap =
getDevelopmentOptionsController(
BluetoothSnoopLogFilterProfileMapPreferenceController.class);
final BluetoothSnoopLogFilterProfilePbapPreferenceController controllerPbap =
getDevelopmentOptionsController(
BluetoothSnoopLogFilterProfilePbapPreferenceController.class);
controllerMap.onSettingChanged();
controllerPbap.onSettingChanged();
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
boolean handledResult = false;
@@ -516,7 +528,11 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new LocalBackupPasswordPreferenceController(context));
controllers.add(new StayAwakePreferenceController(context, lifecycle));
controllers.add(new HdcpCheckingPreferenceController(context));
controllers.add(new BluetoothSnoopLogPreferenceController(context));
controllers.add(new BluetoothSnoopLogPreferenceController(context, fragment));
controllers.add(new DefaultLaunchPreferenceController(context,
"snoop_logger_filters_dashboard"));
controllers.add(new BluetoothSnoopLogFilterProfilePbapPreferenceController(context));
controllers.add(new BluetoothSnoopLogFilterProfileMapPreferenceController(context));
controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
controllers.add(new PictureColorModePreferenceController(context, lifecycle));
controllers.add(new WebViewAppPreferenceController(context));