Merge "Fix WallpaperManager javadoc for new U methods" into udc-dev (77a1d082) · Commits · e / os / android_frameworks_base

core/java/android/app/WallpaperManager.java

+19 −65

Original line number	Diff line number	Diff line
		@@ -913,7 +913,7 @@ public class WallpaperManager {
		* instead the default system wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* and will always throw a {@code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>
		@@ -935,18 +935,9 @@ public class WallpaperManager {
		}

		/**
		* <strong> Important note: </strong>
		* <ul>
		* <li>Up to version S, this method requires the
		* {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} permission.</li>
		* <li>Starting in T, directly accessing the wallpaper is not possible anymore,
		* instead the default system wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>
		* <strong> Important note: </strong> only apps with
		* {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE} should use this method.
		* Otherwise, a {@code SecurityException} will be thrown.
		*
		* <p>
		* Retrieve the requested wallpaper for the specified wallpaper type if the wallpaper is not
		@@ -1206,7 +1197,7 @@ public class WallpaperManager {
		* instead the default system wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* and will always throw a {@code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>
		@@ -1228,18 +1219,9 @@ public class WallpaperManager {
		}

		/**
		* <strong> Important note: </strong>
		* <ul>
		* <li>Up to version S, this method requires the
		* {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} permission.</li>
		* <li>Starting in T, directly accessing the wallpaper is not possible anymore,
		* instead the default system wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>
		* <strong> Important note: </strong> only apps with
		* {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE} should use this method.
		* Otherwise, a {@code SecurityException} will be thrown.
		*
		* <p>
		* Equivalent to {@link #getDrawable(int)}.
		@@ -1268,7 +1250,7 @@ public class WallpaperManager {
		* instead the default wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* and will always throw a {@code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>
		@@ -1290,19 +1272,9 @@ public class WallpaperManager {
		}

		/**
		* <strong> Important note: </strong>
		* <ul>
		* <li>Up to version S, this method requires the
		* {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} permission.</li>
		* <li>Starting in T, directly accessing the wallpaper is not possible anymore,
		* instead the default system wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>
		* <br>
		* <strong> Important note: </strong> only apps with
		* {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE} should use this method.
		* Otherwise, a {@code SecurityException} will be thrown.
		*
		* Like {@link #getDrawable(int)}, but the returned Drawable has a number
		* of limitations to reduce its overhead as much as possible. It will
		@@ -1334,18 +1306,9 @@ public class WallpaperManager {
		}

		/**
		* <strong> Important note: </strong>
		* <ul>
		* <li>Up to version S, this method requires the
		* {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} permission.</li>
		* <li>Starting in T, directly accessing the wallpaper is not possible anymore,
		* instead the default system wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>
		* <strong> Important note: </strong> only apps with
		* {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE} should use this method.
		* Otherwise, a {@code SecurityException} will be thrown.
		*
		* <p>
		* Equivalent to {@link #getFastDrawable()}.
		@@ -1364,18 +1327,9 @@ public class WallpaperManager {
		}

		/**
		* <strong> Important note: </strong>
		* <ul>
		* <li>Up to version S, this method requires the
		* {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} permission.</li>
		* <li>Starting in T, directly accessing the wallpaper is not possible anymore,
		* instead the default system wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>
		* <strong> Important note: </strong> only apps with
		* {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* should use this method. Otherwise, a {@code SecurityException} will be thrown.
		*
		* <p>
		* Equivalent to {@link #getFastDrawable(int)}.
		@@ -1562,7 +1516,7 @@ public class WallpaperManager {
		* instead the default system wallpaper is returned
		* (some versions of T may throw a {@code SecurityException}).</li>
		* <li>From version U, this method should not be used
		* and will always throw a @code SecurityException}.</li>
		* and will always throw a {@code SecurityException}.</li>
		* <li> Apps with {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE}
		* can still access the real wallpaper on all versions. </li>
		* </ul>