Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert from .equals to == to prevent NPE." into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-17 19:57:59 +00:00
committed by Android (Google) Code Review
parent 0ee2fb3c08 3c8936a840
commit 4152cab027
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,8 +224,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NetworkController;
import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserInfoControllerImpl;
import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.statusbar.policy.UserSwitcherController;
import com.android.systemui.unfold.UnfoldLightRevealOverlayAnimation;
import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService;
import com.android.systemui.unfold.UnfoldLightRevealOverlayAnimation;
import com.android.systemui.volume.VolumeComponent; import com.android.systemui.volume.VolumeComponent;
import com.android.systemui.wmshell.BubblesManager; import com.android.systemui.wmshell.BubblesManager;
import com.android.unfold.config.UnfoldTransitionConfig; import com.android.unfold.config.UnfoldTransitionConfig;
@@ -2656,7 +2656,7 @@ public class StatusBar extends SystemUI implements
options.setRotationAnimationHint( options.setRotationAnimationHint(
WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS); 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 // Settings Panel is implemented as activity(not a dialog), so
// underlying app is paused and may enter picture-in-picture mode // underlying app is paused and may enter picture-in-picture mode
// as a result. // as a result.