Merge "Lock screen live wallpaper: add home/lock screen flag as argument." into tm-qpr-dev

core/java/android/app/DisabledWallpaperManager.java

@@ -192,6 +192,16 @@ final class DisabledWallpaperManager extends WallpaperManager {
         return unsupported();
     }
 
+    @Override
+    public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which) {
+        return unsupported();
+    }
+
+    @Override
+    public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) {
+        return unsupported();
+    }
+
     @Override
     public int getWallpaperId(int which) {
         return unsupportedInt();

core/java/android/app/WallpaperManager.java

@@ -1320,18 +1320,16 @@ public class WallpaperManager {
     }
 
     /**
-     * Returns the information about the wallpaper if the current wallpaper is
+     * Returns the information about the home screen wallpaper if its current wallpaper is a live
-     * a live wallpaper component. Otherwise, if the wallpaper is a static image,
+     * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.
-     * this returns null.
      */
     public WallpaperInfo getWallpaperInfo() {
         return getWallpaperInfo(mContext.getUserId());
     }
 
     /**
-     * Returns the information about the wallpaper if the current wallpaper is
+     * Returns the information about the home screen wallpaper if its current wallpaper is a live
-     * a live wallpaper component. Otherwise, if the wallpaper is a static image,
+     * wallpaper component. Otherwise, if the wallpaper is a static image, this returns null.
-     * this returns null.
      *
      * @param userId Owner of the wallpaper.
      * @hide
@@ -1349,6 +1347,29 @@ 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.
+     *
+     * @param which Specifies wallpaper destination (home or lock).
+     * @hide
+     */
+    public WallpaperInfo getWallpaperInfoWithFlags(@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.
+     *
+     * @param which Specifies wallpaper destination (home or lock).
+     * @param userId Owner of the wallpaper.
+     * @hide
+     */
+    public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) {
+        return getWallpaperInfo(userId);
+    }
+
     /**
      * Get the ID of the current wallpaper of the given kind.  If there is no
      * such wallpaper configured, returns a negative number.