Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4db6663 authored by Yasin Kilicdere's avatar Yasin Kilicdere
Browse files

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

Clearing the calling identity should be restored in the finally block.
In WallpaperManagerService.WallpaperConnection.engineShown method
it was restored in catch block. This CL corrects that issue.

Bug: 256605760
Test: n/a
Change-Id: Ibe1e252c6ef8728b0706fe1f58d1c56955ce5733
parent 07d58c6d

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1549,8 +1549,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                    try {

                    try {

                        mReply.sendResult(null);

                        mReply.sendResult(null);

                    } catch (RemoteException e) {

                    } catch (RemoteException e) {

                        Binder.restoreCallingIdentity(ident);

                        Slog.d(TAG, "failed to send callback!", e);

                        Slog.d(TAG, "failed to send callback!", e);

                    } finally {

                        Binder.restoreCallingIdentity(ident);

                    }

                    }

                    mReply = null;

                    mReply = null;

                }

                }