commit 3c62958824b9faf932ef3623028ad73d82c68a6d
author Yasin Kilicdere <tyk@google.com> Fri Nov 25 19:16:30 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 25 19:16:30 2022 +0000
tree f212640c55e7f4b3b58a52dddeefe76fc5d75a95
parent a6573a641c69ad6f8e53042cf84c7b2cc6d435b4

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

This reverts commit a6573a641c69ad6f8e53042cf84c7b2cc6d435b4.

Reason for revert: Reverting the revert, since it wasn't the culprit

Change-Id: I76a92f4a4fad3c1880d8767f91fd5c47631d5069

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 6a35533..7dc4f97 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1549,8 +1549,9 @@
                     try {
                         mReply.sendResult(null);
                     } catch (RemoteException e) {
-                        Binder.restoreCallingIdentity(ident);
                         Slog.d(TAG, "failed to send callback!", e);
+                    } finally {
+                        Binder.restoreCallingIdentity(ident);
                     }
                     mReply = null;
                 }