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

2022-11-24 15:43:14 +00:00
parent 6b5d003f17 a6573a641c
commit e2fa9f4b72
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1559,9 +1559,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);
                    }
                    t.traceEnd();
                    mReply = null;