From 300e371ea98ea329dd0cb18f4e6451eb52c97668 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 27 Mar 2019 19:33:36 -0700
Subject: [PATCH] Do not make IPC when unnecessary

Other conditions will make the method return earlier without making the
binder call.

Test: systrace
Test: adb shell am trace-ipc start
Fixes: 129253243
Change-Id: I182185e222a117c6ccb44f434d5b46f1888685b0
---
 .../statusbar/phone/StatusBarKeyguardViewManager.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index cbaabf7199859..3b32d95262cdb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -760,9 +760,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
     }
 
     public boolean bouncerNeedsScrimming() {
-        return mOccluded || mBouncer.willDismissWithAction()  || mBouncer.needsFullscreenBouncer()
+        return mOccluded || mBouncer.willDismissWithAction()
                 || mStatusBar.isFullScreenUserSwitcherState()
-                || (mBouncer.isShowing() && mBouncer.isScrimmed());
+                || (mBouncer.isShowing() && mBouncer.isScrimmed())
+                || mBouncer.isFullscreenBouncer();
     }
 
     public void dump(PrintWriter pw) {