Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9246ef1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 60a54acb e3d2feaa

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

+4 −1
Original line number Diff line number Diff line
@@ -2671,7 +2671,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                wallpaper.connection.mReply = null;

            }

            try {

                // 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);

            }