commit 16d9be09844c965b1e77f8d849b64828df851437
author Alex <alex@dirtyunicorns.com> Tue Jul 10 23:14:01 2018 -0500
committer rohan <purohit.rohan@gmail.com> Thu Oct 10 23:12:49 2019 +0530
tree 15dc2386d96b933c82304584b9964c994cde110a
parent 82834b29d28278b183b8abe5cf396f65727e4746

Colorpicker: Fix possible NPE

Change-Id: I06628e6fc3ef7651e06b4c03acb048a9bb3e6540

src/com/bliss/support/colorpicker/AlphaPatternDrawable.java

diff --git a/src/com/bliss/support/colorpicker/AlphaPatternDrawable.java b/src/com/bliss/support/colorpicker/AlphaPatternDrawable.java
index 288c124..3649b5f 100644
--- a/src/com/bliss/support/colorpicker/AlphaPatternDrawable.java
+++ b/src/com/bliss/support/colorpicker/AlphaPatternDrawable.java
@@ -54,7 +54,9 @@
 
     @Override
     public void draw(Canvas canvas) {
-        canvas.drawBitmap(mBitmap, null, getBounds(), mPaint);
+        if (mBitmap != null) {
+            canvas.drawBitmap(mBitmap, null, getBounds(), mPaint);
+        }
     }
 
     @Override

src/com/bliss/support/colorpicker/ColorPickerPanelView.java

diff --git a/src/com/bliss/support/colorpicker/ColorPickerPanelView.java b/src/com/bliss/support/colorpicker/ColorPickerPanelView.java
index a6185d1..aa6311d 100644
--- a/src/com/bliss/support/colorpicker/ColorPickerPanelView.java
+++ b/src/com/bliss/support/colorpicker/ColorPickerPanelView.java
@@ -39,7 +39,7 @@
      */
     private final static float    BORDER_WIDTH_PX = 1;
 
-    private float mDensity = 1f;
+    private static float mDensity = 1f;
 
     private int         mBorderColor = 0xff6E6E6E;
     private int         mColor = 0xff000000;