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

Merge "Fix NPE with live wallpaper" into qt-dev

Browse Source 
am: c9fa07161a

Change-Id: I1a08bd2331fcd6986e390a6a8d7a1b30b7096ad7
This commit is contained in:
James O'Leary
2019-05-21 03:45:50 -07:00
committed by android-build-merger
parent 297cdb5ad9 c9fa07161a
commit a55ddc8084
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java
View File

@@ -136,8 +136,12 @@ final class PhoneStateMonitor {
} }
private boolean isLauncherShowing(ActivityManager.RunningTaskInfo runningTaskInfo) { private boolean isLauncherShowing(ActivityManager.RunningTaskInfo runningTaskInfo) {
if (runningTaskInfo == null) {
return false;
} else {
return runningTaskInfo.topActivity.equals(mDefaultHome); return runningTaskInfo.topActivity.equals(mDefaultHome);
} }
}
private boolean isAppImmersive() { private boolean isAppImmersive() {
return SysUiServiceProvider.getComponent(mContext, StatusBar.class).inImmersiveMode(); return SysUiServiceProvider.getComponent(mContext, StatusBar.class).inImmersiveMode();