commit b325ce8203a751b0223e737be1469c42907e6cd5
author Andreas Gampe <agampe@google.com> Thu Jun 19 23:51:12 2014 -0700
committer Andreas Gampe <agampe@google.com> Thu Jun 19 23:51:12 2014 -0700
tree d2d367da5c17cf1108a5430f422502212984e209
parent 5ff885cd3b8013da4d122127bcf9c30b95e3aeb2

Add a null check to UserAvatarView.setBitmap

Adds a null check for the bitmap to set. Resets the paint's shader
in case of a null bitmap to release any previous image.

Change-Id: I1adf3c8ef44522a593fe3f25726b6c83120d7556

packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
index 6c9dc85..6f2642a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
@@ -90,8 +90,12 @@
     public void setBitmap(Bitmap bitmap) {
         setDrawable(null);
         mBitmap = bitmap;
-        mBitmapPaint.setShader(new BitmapShader(
-                bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
+        if (mBitmap != null) {
+            mBitmapPaint.setShader(new BitmapShader(
+                    bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
+        } else {
+            mBitmapPaint.setShader(null);
+        }
         configureBounds();
         invalidate();
     }