Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-01 13:53:09 +00:00
committed by Android (Google) Code Review
parent 60a54acbbf e3d2feaa1f
commit d9246ef1fa
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -2671,7 +2671,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
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);
}