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/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 258819f..450893c 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -3084,8 +3084,7 @@
     }
 
     @Override
-    public void setLockScreenShown(boolean keyguardShowing, boolean aodShowing,
-            int[] secondaryDisplaysShowing) {
+    public void setLockScreenShown(boolean keyguardShowing, boolean aodShowing) {
         if (checkCallingPermission(android.Manifest.permission.DEVICE_POWER)
                 != PackageManager.PERMISSION_GRANTED) {
             throw new SecurityException("Requires permission "
@@ -3102,8 +3101,7 @@
                 mH.sendMessage(msg);
             }
             try {
-                mKeyguardController.setKeyguardShown(keyguardShowing, aodShowing,
-                        secondaryDisplaysShowing);
+                mKeyguardController.setKeyguardShown(keyguardShowing, aodShowing);
             } finally {
                 Binder.restoreCallingIdentity(ident);
             }