From 57001212ee655e023413308b3807bbf22666e14e Mon Sep 17 00:00:00 2001 From: Chris Poultney Date: Thu, 17 Nov 2022 19:49:34 +0000 Subject: [PATCH] Clean up naming of getWallpaperInfo functions. Cleaning up per comments on ag/20208351. Bug: 253481667 Test: CTS testing after merge into master Change-Id: I3d40bfa69f82013257966780e2f702a5a06c3f4c --- .../android/app/DisabledWallpaperManager.java | 6 ++--- core/java/android/app/WallpaperManager.java | 24 ++++++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/core/java/android/app/DisabledWallpaperManager.java b/core/java/android/app/DisabledWallpaperManager.java index 0d14c0bcf1c96..fae68872bc021 100644 --- a/core/java/android/app/DisabledWallpaperManager.java +++ b/core/java/android/app/DisabledWallpaperManager.java @@ -188,17 +188,17 @@ final class DisabledWallpaperManager extends WallpaperManager { } @Override - public WallpaperInfo getWallpaperInfo(int userId) { + public WallpaperInfo getWallpaperInfoForUser(int userId) { return unsupported(); } @Override - public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) { + public WallpaperInfo getWallpaperInfo(@SetWallpaperFlags int which) { return unsupported(); } @Override - public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) { + public WallpaperInfo getWallpaperInfo(@SetWallpaperFlags int which, int userId) { return unsupported(); } diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index c99fa3d3177cf..14fe5226b9d91 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -1324,7 +1324,7 @@ public class WallpaperManager { * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null. */ public WallpaperInfo getWallpaperInfo() { - return getWallpaperInfo(mContext.getUserId()); + return getWallpaperInfoForUser(mContext.getUserId()); } /** @@ -1334,7 +1334,7 @@ public class WallpaperManager { * @param userId Owner of the wallpaper. * @hide */ - public WallpaperInfo getWallpaperInfo(int userId) { + public WallpaperInfo getWallpaperInfoForUser(int userId) { try { if (sGlobals.mService == null) { Log.w(TAG, "WallpaperService not running"); @@ -1349,25 +1349,31 @@ public class WallpaperManager { /** * Returns the information about the home screen wallpaper if its current wallpaper is a live - * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null. + * wallpaper component. Otherwise, if the wallpaper is a static image or is not set, this + * returns null. * - * @param which Specifies wallpaper destination (home or lock). + * @param which Specifies wallpaper to request (home or lock). + * @throws IllegalArgumentException if {@code which} is not exactly one of + * {{@link #FLAG_SYSTEM},{@link #FLAG_LOCK}}. * @hide */ - public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) { + public WallpaperInfo getWallpaperInfo(@SetWallpaperFlags int which) { return getWallpaperInfo(); } /** * Returns the information about the designated wallpaper if its current wallpaper is a live - * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null. + * wallpaper component. Otherwise, if the wallpaper is a static image or is not set, this + * returns null. * - * @param which Specifies wallpaper destination (home or lock). + * @param which Specifies wallpaper to request (home or lock). * @param userId Owner of the wallpaper. + * @throws IllegalArgumentException if {@code which} is not exactly one of + * {{@link #FLAG_SYSTEM},{@link #FLAG_LOCK}}. * @hide */ - public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) { - return getWallpaperInfo(userId); + public WallpaperInfo getWallpaperInfo(@SetWallpaperFlags int which, int userId) { + return getWallpaperInfoForUser(userId); } /**