Merge "Change mODICaptionsTooltipView null check occasion to avoid potential crash" (1add3774) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -1128,13 +1128,13 @@ public class VolumeDialogImpl implements VolumeDialog,
		rescheduleTimeoutH();
		}

		if (mODICaptionsTooltipView != null) {
		mODICaptionsTooltipView.setAlpha(0.0f);

		// We need to wait for layout and then center the caption view. Since the height of the
		// dialog is now dynamic (with the variable ringer drawer height changing the height of
		// the dialog), we need to do this here in code vs. in XML.
		mHandler.post(() -> {
		if (mODICaptionsTooltipView != null) {
		mODICaptionsTooltipView.setAlpha(0.0f);

		final int[] odiTooltipLocation = mODICaptionsTooltipView.getLocationOnScreen();
		final int[] odiButtonLocation = mODICaptionsIcon.getLocationOnScreen();

		@@ -1160,8 +1160,8 @@ public class VolumeDialogImpl implements VolumeDialog,
		}
		})
		.start();
		});
		}
		});
		}

		private void hideCaptionsTooltip() {