commit 177261f5a5ace16587e1047d10e173602c96b616
author wilsonshih <wilsonshih@google.com> Fri Feb 22 12:02:18 2019 +0800
committer wilsonshih <wilsonshih@google.com> Fri Feb 22 13:25:59 2019 +0800
tree fd3c6b9f3e7421ae785429b832a69782c9a52936
parent 1cdbfae1fb6c6400497f18a017892b67e88a6b5a

Remove meaningless parameter in IActivityTaskManager#setLockScreenShown

After ag/5760456, we can remove the parameter secondaryDisplaysShowing
since it becomes meaningless.

Fix: 123373363
Test: atest ActivityManagerMultiDisplayTests
      atest ActivityManagerDisplayKeyguardTests
      atest ActivityManagerDisplayLockedKeyguardTests
      atest KeyguardTests

Change-Id: I5ab5753985bc570bb730b4c7f801cdc263cc1858

services/core/java/com/android/server/wm/KeyguardController.java

diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index b5be2ac5..feb711a 100644
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -49,7 +49,6 @@
 import com.android.server.wm.ActivityTaskManagerInternal.SleepToken;
 
 import java.io.PrintWriter;
-import java.util.Arrays;
 
 /**
  * Controls Keyguard occluding, dismissing and transitions depending on what kind of activities are
@@ -120,18 +119,15 @@
     /**
      * Update the Keyguard showing state.
      */
-    void setKeyguardShown(boolean keyguardShowing, boolean aodShowing,
-            int[] secondaryDisplaysShowing) {
+    void setKeyguardShown(boolean keyguardShowing, boolean aodShowing) {
         boolean showingChanged = keyguardShowing != mKeyguardShowing || aodShowing != mAodShowing;
         // If keyguard is going away, but SystemUI aborted the transition, need to reset state.
         showingChanged |= mKeyguardGoingAway && keyguardShowing;
-        if (!showingChanged && Arrays.equals(secondaryDisplaysShowing,
-                mSecondaryDisplayIdsShowing)) {
+        if (!showingChanged) {
             return;
         }
         mKeyguardShowing = keyguardShowing;
         mAodShowing = aodShowing;
-        mSecondaryDisplayIdsShowing = secondaryDisplaysShowing;
         mWindowManager.setAodShowing(aodShowing);
         if (showingChanged) {
             dismissDockedStackIfNeeded();