summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2017-06-13 00:39:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-06-13 00:39:16 +0000
commit8f76d06c9453283f6c835b0f32ef87c231a2526f (patch)
tree0c7ffebfe98b47fe434d499bf00905eac5669b63
parent1270b399cc9ccb1d20f4281819df233f95442e28 (diff)
parent68a7011894e2f5c13bcb1463a1d4ac03d2d13f78 (diff)
Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4 am: 78c9744f41" into oc-dr1-dev-plus-aosp
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index b8de9f33f900..6d10d9413e66 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1868,12 +1868,7 @@ public class KeyguardViewMediator extends SystemUI {
+ " isSecure=" + isSecure() + " --> flags=0x" + Integer.toHexString(flags));
}
- if (!(mContext instanceof Activity)) {
- final int finalFlags = flags;
- mUiOffloadThread.submit(() -> {
- mStatusBarManager.disable(finalFlags);
- });
- }
+ mStatusBarManager.disable(flags);
}
}