diff options
author | Jon Miranda <jonmiranda@google.com> | 2019-08-01 16:50:56 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-01 16:50:56 -0700 |
commit | b1d8ad6be5d4f02bec05e9b496c6d06b9331b716 (patch) | |
tree | 90b715106f7bf71a1ee15e1598ecceadd6c7e485 /src/com/android | |
parent | bfc2da1fd824089eacd97ce8bbacc41138b14742 (diff) | |
parent | cf92f3edb05cfb3c2783f8b5e7c668dec84f8b15 (diff) | |
download | android_packages_apps_Trebuchet-b1d8ad6be5d4f02bec05e9b496c6d06b9331b716.tar.gz android_packages_apps_Trebuchet-b1d8ad6be5d4f02bec05e9b496c6d06b9331b716.tar.bz2 android_packages_apps_Trebuchet-b1d8ad6be5d4f02bec05e9b496c6d06b9331b716.zip |
Merge "Bandage fix for bitmap fatal exception where width / height !> 0." into ub-launcher3-qt-r1-dev
am: cf92f3edb0
Change-Id: Iea9db807ebc65bcb612294a4283346e714b25f63
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java b/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java index 0c5a1fc5a..d8a1f9951 100644 --- a/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java +++ b/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java @@ -28,6 +28,8 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.util.Log; +import androidx.annotation.Nullable; + import com.android.launcher3.Launcher; import com.android.launcher3.MainThreadExecutor; import com.android.launcher3.R; @@ -66,15 +68,19 @@ public class FolderAdaptiveIcon extends AdaptiveIconDrawable { return mBadge; } - public static FolderAdaptiveIcon createFolderAdaptiveIcon( + public static @Nullable FolderAdaptiveIcon createFolderAdaptiveIcon( Launcher launcher, int folderId, Point dragViewSize) { Preconditions.assertNonUiThread(); int margin = launcher.getResources() .getDimensionPixelSize(R.dimen.blur_size_medium_outline); // Allocate various bitmaps on the background thread, because why not! - final Bitmap badge = Bitmap.createBitmap( - dragViewSize.x - margin, dragViewSize.y - margin, Bitmap.Config.ARGB_8888); + int width = dragViewSize.x - margin; + int height = dragViewSize.y - margin; + if (width <= 0 || height <= 0) { + return null; + } + final Bitmap badge = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); // Create the actual drawable on the UI thread to avoid race conditions with // FolderIcon draw pass |