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

Commit 3c34ea26 authored by wilsonshih's avatar wilsonshih Committed by android-build-merger
Browse files

Merge "Clear the calling identity in isUsableDisplay." into qt-dev 

am: 6102c2f7

Change-Id: I08fbfbf82fe071548a83ede56af3cee84a4ebd9a
parents be0c1784 6102c2f7

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

+10 −2
Original line number Diff line number Diff line
@@ -1172,8 +1172,16 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                return false;

            }

            final int displayId = display.getDisplayId();

            return displayId == DEFAULT_DISPLAY

                    || mWindowManagerInternal.shouldShowSystemDecorOnDisplay(displayId);

            if (displayId == DEFAULT_DISPLAY) {

                return true;

            }



            final long ident = Binder.clearCallingIdentity();

            try {

                return mWindowManagerInternal.shouldShowSystemDecorOnDisplay(displayId);

            } finally {

                Binder.restoreCallingIdentity(ident);

            }

        }



        void forEachDisplayConnector(Consumer<DisplayConnector> action) {