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 am: 7fcaee5366

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

Change-Id: Iaff340929b0b3ac957d0fa93e4169bcdb213aab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Poultney
2022-11-18 17:49:32 +00:00
committed by Automerger Merge Worker
parent 06a74a9126 7fcaee5366
commit 76111f60d7
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
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();
}

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.
*/
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);
}
/**