Merge "Update read wallpaper methods (U and above)" into udc-dev (84617c01) · Commits · e / os / android_frameworks_base

core/api/current.txt

+9 −9

Original line number	Diff line number	Diff line
		@@ -7575,23 +7575,23 @@ package android.app {
		method public android.content.Intent getCropAndSetWallpaperIntent(android.net.Uri);
		method public int getDesiredMinimumHeight();
		method public int getDesiredMinimumWidth();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.graphics.drawable.Drawable getDrawable();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.graphics.drawable.Drawable getDrawable(int);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.graphics.drawable.Drawable getFastDrawable();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.graphics.drawable.Drawable getFastDrawable(int);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable getDrawable();
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable getDrawable(int);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable getFastDrawable();
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable getFastDrawable(int);
		method public static android.app.WallpaperManager getInstance(android.content.Context);
		method @Nullable public android.app.WallpaperColors getWallpaperColors(int);
		method @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.os.ParcelFileDescriptor getWallpaperFile(int);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.os.ParcelFileDescriptor getWallpaperFile(int);
		method public int getWallpaperId(int);
		method public android.app.WallpaperInfo getWallpaperInfo();
		method @Nullable public android.app.WallpaperInfo getWallpaperInfo(int);
		method public boolean hasResourceWallpaper(@RawRes int);
		method public boolean isSetWallpaperAllowed();
		method public boolean isWallpaperSupported();
		method @Nullable public android.graphics.drawable.Drawable peekDrawable();
		method @Nullable public android.graphics.drawable.Drawable peekDrawable(int);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.graphics.drawable.Drawable peekFastDrawable();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.graphics.drawable.Drawable peekFastDrawable(int);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable peekDrawable();
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable peekDrawable(int);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable peekFastDrawable();
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_EXTERNAL_STORAGE, "android.permission.READ_WALLPAPER_INTERNAL"}) public android.graphics.drawable.Drawable peekFastDrawable(int);
		method public void removeOnColorsChangedListener(@NonNull android.app.WallpaperManager.OnColorsChangedListener);
		method public void sendWallpaperCommand(android.os.IBinder, String, int, int, int, android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public void setBitmap(android.graphics.Bitmap) throws java.io.IOException;

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -476,7 +476,7 @@ package android.app {
		method @Nullable public android.graphics.Rect peekBitmapDimensions(int);
		method public void setWallpaperZoomOut(@NonNull android.os.IBinder, float);
		method public boolean shouldEnableWideColorGamut();
		method @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public boolean wallpaperSupportsWcg(int);
		method public boolean wallpaperSupportsWcg(int);
		}

		public class WindowConfiguration implements java.lang.Comparable<android.app.WindowConfiguration> android.os.Parcelable {

core/java/android/app/WallpaperManager.java

+214 −14

File changed.

Preview size limit exceeded, changes collapsed.

core/res/AndroidManifest.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -4038,8 +4038,7 @@
		android:description="@string/permdesc_setWallpaperHints"
		android:protectionLevel="normal" />

		<!-- Allow the app to read the system wallpaper image without
		holding the READ_EXTERNAL_STORAGE permission.
		<!-- Allow the app to read the system and lock wallpaper images.
		<p>Not for use by third-party applications.
		@hide
		@SystemApi

data/etc/com.android.systemui.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@
		<permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
		<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
		<permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
		<permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
		<permission name="android.permission.REAL_GET_TASKS"/>
		<permission name="android.permission.REQUEST_NETWORK_SCORES"/>
		<permission name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE"/>