Merge "Revert "Revert "Binder.restoreCallingIdentity moved from 'catch' to 'finally' block."""

2022-11-30 22:51:56 +00:00
parent 3708b37830 3c62958824
commit 4684ff1f67
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1559,8 +1559,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
                    try {
                        mReply.sendResult(null);
                    } catch (RemoteException e) {
-                        Binder.restoreCallingIdentity(ident);
                        Slog.d(TAG, "failed to send callback!", e);
+                    } finally {
+                        Binder.restoreCallingIdentity(ident);
                    }
                    t.traceEnd();
                    mReply = null;