Merge "Allow two SurfaceViews inbetween the app and the wallpaper."

Author: Jean-Baptiste Queru

services/java/com/android/server/WindowManagerService.java

@@ -1501,6 +1501,7 @@ int adjustWallpaperWindowsLocked() {
                 WindowState wb = (WindowState)localmWindows.get(foundI-1);
                 if (wb.mBaseLayer < maxLayer &&
                         wb.mAttachedWindow != foundW &&
+                        wb.mAttachedWindow != foundW.mAttachedWindow &&
                         (wb.mAttrs.type != TYPE_APPLICATION_STARTING ||
                                 wb.mToken != foundW.mToken)) {
                     // This window is not related to the previous one in any