Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev

This commit is contained in:
Selim Cinek
2016-08-15 18:35:57 +00:00
committed by Android (Google) Code Review

View File

@@ -2517,8 +2517,7 @@ public abstract class BaseStatusBar extends SystemUI implements
boolean inUse = mPowerManager.isScreenOn() boolean inUse = mPowerManager.isScreenOn()
&& (!mStatusBarKeyguardViewManager.isShowing() && (!mStatusBarKeyguardViewManager.isShowing()
|| mStatusBarKeyguardViewManager.isOccluded()) || mStatusBarKeyguardViewManager.isOccluded());
&& !mStatusBarKeyguardViewManager.isInputRestricted();
try { try {
inUse = inUse && !mDreamManager.isDreaming(); inUse = inUse && !mDreamManager.isDreaming();
} catch (RemoteException e) { } catch (RemoteException e) {