From a6573a641c69ad6f8e53042cf84c7b2cc6d435b4 Mon Sep 17 00:00:00 2001
From: Yasin Kilicdere <tyk@google.com>
Date: Wed, 23 Nov 2022 20:05:32 +0000
Subject: [PATCH] Revert "Binder.restoreCallingIdentity moved from 'catch' to
 'finally' block."

This reverts commit b4db66635a7aae10927171fe2d8ab6ab0e41bb05.

Reason for revert: b/260184263 - systemui crash with SecurityException
Bug: 260184263

Change-Id: Ia9841bcafda41524f0f25d5ffbf2d32ac65fa374
---
 .../com/android/server/wallpaper/WallpaperManagerService.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 7dc4f9782e705..6a3553315e5a4 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1549,9 +1549,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
                     try {
                         mReply.sendResult(null);
                     } catch (RemoteException e) {
-                        Slog.d(TAG, "failed to send callback!", e);
-                    } finally {
                         Binder.restoreCallingIdentity(ident);
+                        Slog.d(TAG, "failed to send callback!", e);
                     }
                     mReply = null;
                 }