commit d9246ef1fa429d7c27e489bb97d18dea4f33aa12
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 01 13:53:09 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 01 13:53:09 2019 +0000
tree ff53c348e0edbf9c39c774b2d225e73e2655cf0d
parent 60a54acbbf5c10ae11d17aa2b94af07744506379
parent e3d2feaa1f5acb011403925c81d58b589edbfa7c

Merge "Fix wallpaper NPE caused by user switching before IWallpaperService connection"

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index c2a4339..d52ba16 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2671,7 +2671,10 @@
                 wallpaper.connection.mReply = null;
             }
             try {
-                wallpaper.connection.mService.detach();
+                // It can be null if user switching happens before service connection.
+                if (wallpaper.connection.mService != null) {
+                    wallpaper.connection.mService.detach();
+                }
             } catch (RemoteException e) {
                 Slog.w(TAG, "Failed detaching wallpaper service ", e);
             }