Merge "Fix API doc errors" into main (3dc47bae) · Commits · e / os / android_frameworks_base

core/java/android/app/WallpaperManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2730,6 +2730,7 @@ public class WallpaperManager {
		* @param allowBackup {@code true} if the OS is permitted to back up this wallpaper
		* image for restore to a future device; {@code false} otherwise.
		* @param which Flags indicating which wallpaper(s) to configure with the new imagery.
		* @return An integer ID assigned to the newly active wallpaper; or zero on failure.
		* @hide
		*/
		@FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)

+5 −3

Original line number	Diff line number	Diff line
		@@ -118,14 +118,16 @@ public final class WallpaperDescription implements Parcelable {
		}

		/**
		* @return the title for this wallpaper, with each list element intended to be a separate
		* line, or {@code null} if not provided
		* @return the title for this wallpaper, or {@code null} if not provided
		*/
		@Nullable public CharSequence getTitle() {
		return mTitle;
		}

		/** @return the description for this wallpaper */
		/**
		* @return the description for this wallpaper, with each list element intended to be shown on a
		* separate line in the UI
		*/
		@NonNull
		public List<CharSequence> getDescription() {
		return mDescription;