From 1a7019c85f89ba5c265fdf068146045d94e3cfa1 Mon Sep 17 00:00:00 2001
From: Josh Tsuji <tsuji@google.com>
Date: Thu, 5 Aug 2021 12:55:36 -0400
Subject: [PATCH] Don't let ringer drawer icons be clicked while the drawer is
 animating closed.

This could happen after a quick double tap on the ringer icon, where you'd hit the ringer icon as the drawer animated shut. This resulted in a permanently unusable ringer drawer (a reboot was needed to fix).

Fixes: 195392457
Test: switch to vibrate, then tap the ringer icon several times quickly
Change-Id: If5ddd2a27364a6fd66ebd6bfd12b5810e1973a75
---
 .../src/com/android/systemui/volume/VolumeDialogImpl.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 3320852ca1f46..60b92ef45291c 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -2248,6 +2248,11 @@ public class VolumeDialogImpl implements VolumeDialog,
 
         @Override
         public void onClick(View view) {
+            // If the ringer drawer isn't open, don't let anything in it be clicked.
+            if (!mIsRingerDrawerOpen) {
+                return;
+            }
+
             setRingerMode(mClickedRingerMode);
 
             mRingerDrawerIconAnimatingSelected = getDrawerIconViewForMode(mClickedRingerMode);