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

Merge "Prevent crash if detachWallpaperLocked is called multiple times" into udc-dev

Browse Source
This commit is contained in:
Marzia Favaro
2023-03-03 11:51:27 +00:00
committed by Android (Google) Code Review
parent eb3e27a92c 6e312b9b71
commit 0786743a54
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -945,7 +945,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
mWindowManagerInternal.removeWindowToken(mToken, false/* removeWindows */,
mDisplayId);
try {
connection.mService.detach(mToken);
if (connection.mService != null) {
connection.mService.detach(mToken);
}
} catch (RemoteException e) {
Slog.w(TAG, "connection.mService.destroy() threw a RemoteException");
}