Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up naming of getWallpaperInfo functions." into tm-qpr-dev

Browse Source
This commit is contained in:
Chris Poultney
2022-11-18 17:09:58 +00:00
committed by Android (Google) Code Review
parent ea07782541 57001212ee
commit 7fcaee5366
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/DisabledWallpaperManager.java
View File

@@ -188,17 +188,17 @@ final class DisabledWallpaperManager extends WallpaperManager {
} }
@Override @Override
public WallpaperInfo getWallpaperInfo(int userId) { public WallpaperInfo getWallpaperInfoForUser(int userId) {
return unsupported(); return unsupported();
} }
@Override @Override
public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) { public WallpaperInfo getWallpaperInfo(@SetWallpaperFlags int which) {
return unsupported(); return unsupported();
} }
@Override @Override
public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) { public WallpaperInfo getWallpaperInfo(@SetWallpaperFlags int which, int userId) {
return unsupported(); return unsupported();
} }

24
core/java/android/app/WallpaperManager.java
View File

@@ -1324,7 +1324,7 @@ public class WallpaperManager {
* wallpaper component. Otherwise, if the wallpaper is a static image, this returns null. * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.
*/ */
public WallpaperInfo getWallpaperInfo() { public WallpaperInfo getWallpaperInfo() {
return getWallpaperInfo(mContext.getUserId()); return getWallpaperInfoForUser(mContext.getUserId());
} }
/** /**
@@ -1334,7 +1334,7 @@ public class WallpaperManager {
* @param userId Owner of the wallpaper. * @param userId Owner of the wallpaper.
* @hide * @hide
*/ */
public WallpaperInfo getWallpaperInfo(int userId) { public WallpaperInfo getWallpaperInfoForUser(int userId) {
try { try {
if (sGlobals.mService == null) { if (sGlobals.mService == null) {
Log.w(TAG, "WallpaperService not running"); 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 * 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 * @hide
*/ */
public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) { public WallpaperInfo getWallpaperInfo(@SetWallpaperFlags int which) {
return getWallpaperInfo(); return getWallpaperInfo();
} }
/** /**
* Returns the information about the designated wallpaper if its current wallpaper is a live * 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. * @param userId Owner of the wallpaper.
* @throws IllegalArgumentException if {@code which} is not exactly one of
* {{@link #FLAG_SYSTEM},{@link #FLAG_LOCK}}.
* @hide * @hide
*/ */
public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) { public WallpaperInfo getWallpaperInfo(@SetWallpaperFlags int which, int userId) {
return getWallpaperInfo(userId); return getWallpaperInfoForUser(userId);
} }
/** /**