From 3c8936a840a0fa2b096d3f65f67e997baf6042f6 Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Tue, 17 Aug 2021 09:13:30 -0400
Subject: [PATCH] Revert from .equals to == to prevent NPE.

This is one line revert of an earlier change.

Fixes: 195276491
Test: manual
Change-Id: I7868bd6f884c10453f4123e14be8a48e16e867f8
---
 .../src/com/android/systemui/statusbar/phone/StatusBar.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 444432e0fecf2..184c064afd5cf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -224,8 +224,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.statusbar.policy.NetworkController;
 import com.android.systemui.statusbar.policy.UserInfoControllerImpl;
 import com.android.systemui.statusbar.policy.UserSwitcherController;
-import com.android.systemui.unfold.UnfoldLightRevealOverlayAnimation;
 import com.android.systemui.tuner.TunerService;
+import com.android.systemui.unfold.UnfoldLightRevealOverlayAnimation;
 import com.android.systemui.volume.VolumeComponent;
 import com.android.systemui.wmshell.BubblesManager;
 import com.android.unfold.config.UnfoldTransitionConfig;
@@ -2656,7 +2656,7 @@ public class StatusBar extends SystemUI implements
                             options.setRotationAnimationHint(
                                     WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS);
                         }
-                        if (intent.getAction().equals(Settings.Panel.ACTION_VOLUME)) {
+                        if (Settings.Panel.ACTION_VOLUME.equals(intent.getAction())) {
                             // Settings Panel is implemented as activity(not a dialog), so
                             // underlying app is paused and may enter picture-in-picture mode
                             // as a result.