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

Merge "Fix NPE in StatusBar#onBackPressed()"

Browse Source 
am: 6cfa7f2fee

Change-Id: Ic29857e67231ff109535adf18882b869d7ce6af1
This commit is contained in:
Kensuke Matsui
2017-09-06 15:17:05 +00:00
committed by android-build-merger
parent a672ffa42f 6cfa7f2fee
commit 10379e1f17
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4712,7 +4712,7 @@ public class StatusBar extends SystemUI implements DemoMode,
animateCollapsePanels(); animateCollapsePanels();
return true; return true;
} }
if (mKeyguardUserSwitcher.hideIfNotSimple(true)) { if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) {
return true; return true;
} }
return false; return false;