Merge "Merge "Fix NPE with live wallpaper" into qt-dev am: c9fa07161a am:... (f7cfa2fd) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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();