diff options
| author | 2016-08-15 18:35:57 +0000 | |
|---|---|---|
| committer | 2016-08-15 18:35:59 +0000 | |
| commit | 45d2ff9b6aa02e570e412f096160837f5c06130f (patch) | |
| tree | a1c3873bdab600456ab7c1ab3fbb6b2a248186c2 | |
| parent | 375ac0404473a7a70606b86b3bdb29497d12c7b3 (diff) | |
| parent | 2dabc8286b4ad91f711dd9358c50f92106e2f353 (diff) | |
Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index c575417e873e..a1854fa06562 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -2517,8 +2517,7 @@ public abstract class BaseStatusBar extends SystemUI implements boolean inUse = mPowerManager.isScreenOn() && (!mStatusBarKeyguardViewManager.isShowing() - || mStatusBarKeyguardViewManager.isOccluded()) - && !mStatusBarKeyguardViewManager.isInputRestricted(); + || mStatusBarKeyguardViewManager.isOccluded()); try { inUse = inUse && !mDreamManager.isDreaming(); } catch (RemoteException e) { |