Merge "Remove flag liveWallpaperContentHandling" into main (3aa89f4d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -10037,7 +10037,7 @@ package android.app.usage {

		package android.app.wallpaper {

		@FlaggedApi("android.app.live_wallpaper_content_handling") public final class WallpaperDescription implements android.os.Parcelable {
		public final class WallpaperDescription implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public android.content.ComponentName getComponent();
		method @NonNull public android.os.PersistableBundle getContent();
		@@ -10064,7 +10064,7 @@ package android.app.wallpaper {
		method @NonNull public android.app.wallpaper.WallpaperDescription.Builder setTitle(@Nullable CharSequence);
		}

		@FlaggedApi("android.app.live_wallpaper_content_handling") public final class WallpaperInstance implements android.os.Parcelable {
		public final class WallpaperInstance implements android.os.Parcelable {
		ctor public WallpaperInstance(@Nullable android.app.WallpaperInfo, @NonNull android.app.wallpaper.WallpaperDescription);
		method public int describeContents();
		method @NonNull public android.app.wallpaper.WallpaperDescription getDescription();
		@@ -43495,7 +43495,7 @@ package android.service.wallpaper {
		ctor public WallpaperService();
		method public final android.os.IBinder onBind(android.content.Intent);
		method @MainThread public abstract android.service.wallpaper.WallpaperService.Engine onCreateEngine();
		method @FlaggedApi("android.app.live_wallpaper_content_handling") @MainThread @Nullable public android.service.wallpaper.WallpaperService.Engine onCreateEngine(@NonNull android.app.wallpaper.WallpaperDescription);
		method @MainThread @Nullable public android.service.wallpaper.WallpaperService.Engine onCreateEngine(@NonNull android.app.wallpaper.WallpaperDescription);
		field public static final String SERVICE_INTERFACE = "android.service.wallpaper.WallpaperService";
		field public static final String SERVICE_META_DATA = "android.service.wallpaper";
		}
		@@ -43511,7 +43511,7 @@ package android.service.wallpaper {
		method public boolean isPreview();
		method public boolean isVisible();
		method public void notifyColorsChanged();
		method @FlaggedApi("android.app.live_wallpaper_content_handling") @Nullable public android.app.wallpaper.WallpaperDescription onApplyWallpaper(int);
		method @Nullable public android.app.wallpaper.WallpaperDescription onApplyWallpaper(int);
		method @MainThread public void onApplyWindowInsets(android.view.WindowInsets);
		method @MainThread public android.os.Bundle onCommand(String, int, int, int, android.os.Bundle, boolean);
		method @MainThread @Nullable public android.app.WallpaperColors onComputeColors();

core/api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -1314,14 +1314,14 @@ package android.app {
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void clearWallpaper(int, int);
		method @FloatRange(from=0.0f, to=1.0f) @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public float getWallpaperDimAmount();
		method @FlaggedApi("com.android.server.backup.enable_cross_platform_transfer") @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, android.Manifest.permission.READ_WALLPAPER_INTERNAL}) public android.os.ParcelFileDescriptor getWallpaperFile(int, boolean);
		method @FlaggedApi("android.app.live_wallpaper_content_handling") @Nullable @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public android.app.wallpaper.WallpaperInstance getWallpaperInstance(int);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public android.app.wallpaper.WallpaperInstance getWallpaperInstance(int);
		method @FlaggedApi("com.android.server.backup.enable_cross_platform_transfer") @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public boolean isWallpaperBackupEligible(int);
		method @FlaggedApi("com.android.server.backup.enable_cross_platform_transfer") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmapWithDescription(@NonNull android.graphics.Bitmap, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException;
		method public void setDisplayOffset(android.os.IBinder, int, int);
		method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithCrops(@NonNull java.io.InputStream, @NonNull android.util.SparseArray<android.graphics.Rect>, boolean, int) throws java.io.IOException;
		method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithDescription(@NonNull java.io.InputStream, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException;
		method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithDescription(@NonNull java.io.InputStream, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException;
		method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponent(android.content.ComponentName);
		method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(allOf={android.Manifest.permission.SET_WALLPAPER_COMPONENT, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional=true) public boolean setWallpaperComponentWithDescription(@NonNull android.app.wallpaper.WallpaperDescription, int);
		method @RequiresPermission(allOf={android.Manifest.permission.SET_WALLPAPER_COMPONENT, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional=true) public boolean setWallpaperComponentWithDescription(@NonNull android.app.wallpaper.WallpaperDescription, int);
		method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponentWithFlags(@NonNull android.content.ComponentName, int);
		method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public void setWallpaperDimAmount(@FloatRange(from=0.0f, to=1.0f) float);
		}
		@@ -3272,7 +3272,7 @@ package android.app.usage {

		package android.app.wallpaper {

		@FlaggedApi("android.app.live_wallpaper_content_handling") public final class WallpaperDescription implements android.os.Parcelable {
		public final class WallpaperDescription implements android.os.Parcelable {
		method @NonNull public android.util.SparseArray<android.graphics.Rect> getCropHints();
		}

core/java/android/app/WallpaperManager.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package android.app;
		import static android.Manifest.permission.MANAGE_EXTERNAL_STORAGE;
		import static android.Manifest.permission.READ_WALLPAPER_INTERNAL;
		import static android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT;
		import static android.app.Flags.FLAG_LIVE_WALLPAPER_CONTENT_HANDLING;
		import static android.content.pm.PackageManager.PERMISSION_GRANTED;
		import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;

		@@ -2146,7 +2145,6 @@ public class WallpaperManager {
		* @hide
		*/
		@Nullable
		@FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)
		@RequiresPermission(READ_WALLPAPER_INTERNAL)
		@SystemApi
		public WallpaperInstance getWallpaperInstance(@SetWallpaperFlags int which) {
		@@ -2165,7 +2163,6 @@ public class WallpaperManager {
		* @hide
		*/
		@Nullable
		@FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)
		@RequiresPermission(READ_WALLPAPER_INTERNAL)
		public WallpaperInstance getWallpaperInstance(@SetWallpaperFlags int which,
		boolean createMissingId) {
		@@ -2836,7 +2833,6 @@ public class WallpaperManager {
		* @return An integer ID assigned to the newly active wallpaper; or zero on failure.
		* @hide
		*/
		@FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)
		@SystemApi
		@RequiresPermission(android.Manifest.permission.SET_WALLPAPER)
		public int setStreamWithDescription(@NonNull InputStream bitmapData,
		@@ -3255,7 +3251,6 @@ public class WallpaperManager {
		*
		* @hide
		*/
		@FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)
		@SystemApi
		@RequiresPermission(allOf = {android.Manifest.permission.SET_WALLPAPER_COMPONENT,
		Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional = true)
		@@ -3280,7 +3275,6 @@ public class WallpaperManager {
		*
		* @hide
		*/
		@FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)
		@RequiresPermission(allOf = {android.Manifest.permission.SET_WALLPAPER_COMPONENT,
		Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional = true)
		public boolean setWallpaperComponentWithDescription(@NonNull WallpaperDescription description,

core/java/android/app/wallpaper/WallpaperDescription.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		package android.app.wallpaper;

		import static android.app.Flags.FLAG_LIVE_WALLPAPER_CONTENT_HANDLING;

		import android.annotation.FlaggedApi;
		import android.annotation.SystemApi;
		import android.app.WallpaperInfo;
		import android.app.WallpaperManager;
		@@ -65,7 +62,6 @@ import java.util.Objects;
		* component. Each {@link WallpaperDescription} can have distinct metadata.
		* </p>
		*/
		@FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)
		public final class WallpaperDescription implements Parcelable {
		private static final String TAG = "WallpaperDescription";
		private static final String XML_TAG_CONTENT = "content";

core/java/android/app/wallpaper/WallpaperInstance.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		package android.app.wallpaper;

		import static android.app.Flags.FLAG_LIVE_WALLPAPER_CONTENT_HANDLING;

		import android.annotation.FlaggedApi;
		import android.app.WallpaperInfo;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -41,7 +38,6 @@ import java.util.Objects;
		* </ul>
		* </p>
		*/
		@FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING)
		public final class WallpaperInstance implements Parcelable {
		/**
		* Default id to use when none is provided.