Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2802ddb6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert from .equals to == to prevent NPE." into sc-v2-dev am: 4152cab0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15596213

Change-Id: I276fd3147af0585b2262f9f1b1bf4057f96d1ad8
parents b2d91918 4152cab0

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -2657,7 +2657,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.