RESTRICT AUTOMERGE am: b81f269ae2 am: db965097eb

Change-Id: I78c1a49ba6c0b883b506320dbfa2503e4c3c4c5e

diff --combined services/core/java/com/android/server/wm/DisplayPolicy.java
index b37c779,21dcbb3..2d835d3
--- 1/services/core/java/com/android/server/wm/DisplayPolicy.java
--- 2/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@@ -865,6 -865,8 +865,8 @@@ public class DisplayPolicy 
                  if (canToastShowWhenLocked(callingPid)) {
                      attrs.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
                  }
+                 // Toasts can't be clickable
+                 attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
                  break;
          }
  
@@@ -2812,11 -2814,7 +2814,11 @@@
          mHandler.post(() -> {
              final int displayId = getDisplayId();
              getStatusBarManagerInternal().onDisplayReady(displayId);
 -            LocalServices.getService(WallpaperManagerInternal.class).onDisplayReady(displayId);
 +            final WallpaperManagerInternal wpMgr = LocalServices
 +                    .getService(WallpaperManagerInternal.class);
 +            if (wpMgr != null) {
 +                wpMgr.onDisplayReady(displayId);
 +            }
          });
      }
  
@@@ -3626,8 -3624,7 +3628,8 @@@
          if (mScreenshotHelper != null) {
              mScreenshotHelper.takeScreenshot(screenshotType,
                      mStatusBar != null && mStatusBar.isVisibleLw(),
 -                    mNavigationBar != null && mNavigationBar.isVisibleLw(), mHandler);
 +                    mNavigationBar != null && mNavigationBar.isVisibleLw(),
 +                    mHandler, null /* completionConsumer */);
          }
      }