Merge "Fix binder identity use when clearing wallpapers" into lmp-dev (b75dd5ce) · Commits · e / os / android_frameworks_base

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

+24 −22

Original line number	Diff line number	Diff line
		@@ -602,6 +602,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
		f.delete();
		}
		final long ident = Binder.clearCallingIdentity();
		try {
		RuntimeException e = null;
		try {
		wallpaper.imageWallpaperPending = false;
		@@ -613,8 +614,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
		}
		} catch (IllegalArgumentException e1) {
		e = e1;
		} finally {
		Binder.restoreCallingIdentity(ident);
		}

		// This can happen if the default wallpaper component doesn't
		@@ -629,6 +628,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
		} catch (RemoteException e1) {
		}
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		public boolean hasNamedWallpaper(String name) {