Merge "Fix crash when toggling ambient collapse button in hearing device dialog" into main (4f06c68f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java

+4 −15

Original line number	Diff line number	Diff line
		@@ -289,6 +289,8 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate,
		List<DeviceItem> hearingDeviceItemList = getHearingDeviceItemList();
		CachedBluetoothDevice activeHearingDevice = getActiveHearingDevice(
		hearingDeviceItemList);
		mLocalBluetoothManager.getEventManager().registerCallback(this);

		mMainExecutor.execute(() -> {
		setupDeviceListView(dialog, hearingDeviceItemList);
		setupPairNewDeviceButton(dialog);
		@@ -301,21 +303,6 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate,
		});
		}

		@Override
		public void onStart(@NonNull SystemUIDialog dialog) {
		mBgExecutor.execute(() -> {
		if (mLocalBluetoothManager != null) {
		mLocalBluetoothManager.getEventManager().registerCallback(this);
		}
		if (mPresetController != null) {
		mPresetController.registerHapCallback();
		}
		if (mAmbientController != null) {
		mAmbientController.start();
		}
		});
		}

		@Override
		public void onStop(@NonNull SystemUIDialog dialog) {
		mBgExecutor.execute(() -> {
		@@ -378,6 +365,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate,

		mPresetLayout = dialog.requireViewById(R.id.preset_layout);
		mPresetLayout.setVisibility(mPresetController.isPresetControlAvailable() ? VISIBLE : GONE);
		mBgExecutor.execute(() -> mPresetController.registerHapCallback());
		}

		private void setupAmbientControls(CachedBluetoothDevice activeHearingDevice) {
		@@ -387,6 +375,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate,
		mDialog.getContext(), mLocalBluetoothManager, ambientLayout);
		mAmbientController.setShowUiWhenLocalDataExist(false);
		mAmbientController.loadDevice(activeHearingDevice);
		mBgExecutor.execute(() -> mAmbientController.start());
		}

		private void setupPairNewDeviceButton(SystemUIDialog dialog) {