commit 4684ff1f676e3359aed40ba441c0fbc106dc17c1
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 30 22:51:56 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 30 22:51:56 2022 +0000
tree 8a2f6594622c5b892a8b804188b9dc2fe756c6e3
parent 3708b3783021e708ea1a328e9c5078c55d7cede6
parent 3c62958824b9faf932ef3623028ad73d82c68a6d

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

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

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index f74956b..5d08461 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1559,8 +1559,9 @@
                     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;