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

Commit 5392d935 authored by Chris Poultney's avatar Chris Poultney Committed by Automerger Merge Worker
Browse files

Merge "Add override to WallpaperManager.peekBitmapDimensions with `which`...

Merge "Add override to WallpaperManager.peekBitmapDimensions with `which` param" into tm-qpr-dev am: aebffa1f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20552100



Change-Id: I7ea060b3bb8bf48327448999aead4db2a0330a70
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 931c953e aebffa1f
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -1132,11 +1132,25 @@ public class WallpaperManager {
     * @return the dimensions of system wallpaper
     * @hide
     */
    @Nullable
    public Rect peekBitmapDimensions() {
        return sGlobals.peekWallpaperDimensions(
                mContext, true /* returnDefault */, mContext.getUserId());
    }

    /**
     * Peek the dimensions of given wallpaper of the user without decoding it.
     *
     * @param which Wallpaper type. Must be either {@link #FLAG_SYSTEM} or
     *     {@link #FLAG_LOCK}.
     * @return the dimensions of system wallpaper
     * @hide
     */
    @Nullable
    public Rect peekBitmapDimensions(@SetWallpaperFlags int which) {
        return peekBitmapDimensions();
    }

    /**
     * Get an open, readable file descriptor to the given wallpaper image file.
     * The caller is responsible for closing the file descriptor when done ingesting the file.