commit b0f3b836b9fe98d395fdbadf2cdd3603f4e0145a
author Wale Ogunwale <ogunwale@google.com> Mon Oct 17 10:13:07 2016 -0700
committer Wale Ogunwale <ogunwale@google.com> Mon Oct 17 15:36:50 2016 -0700
tree e7186a6115de6a99bc8ef621a1b3e5512c83593c
parent e5bfd737ee7033d4c9309d621b7c5f1f78f8f2b4

Clean up use of DisplayContent from WindowState.

Follow up to ag/1483993 where WindowTokens can now only be on one display.
Clean-up some existing code that dealt with having WindowTokens on
multiple displays.

Test: Existing tests pass.
Change-Id: Ie908eda37bc44097dea773b0fc163d35cc9baf35

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

diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java
index 962325f..0841231 100644
--- a/services/core/java/com/android/server/wm/WallpaperController.java
+++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -146,18 +146,11 @@
     }
 
     void updateWallpaperVisibility() {
-        final DisplayContent displayContent = mWallpaperTarget.getDisplayContent();
-        if (displayContent == null) {
-            return;
-        }
         final boolean visible = isWallpaperVisible(mWallpaperTarget);
-        final DisplayInfo displayInfo = displayContent.getDisplayInfo();
-        final int dw = displayInfo.logicalWidth;
-        final int dh = displayInfo.logicalHeight;
 
         for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) {
             final WindowToken token = mWallpaperTokens.get(curTokenNdx);
-            token.updateWallpaperVisibility(dw, dh, visible, displayContent);
+            token.updateWallpaperVisibility(visible);
         }
     }
 
@@ -309,7 +302,7 @@
         return null;
     }
 
-    void updateWallpaperOffsetLocked(WindowState changingTarget, boolean sync) {
+    private void updateWallpaperOffsetLocked(WindowState changingTarget, boolean sync) {
         final DisplayContent displayContent = changingTarget.getDisplayContent();
         if (displayContent == null) {
             return;