From ec1d075e5fab3e2d4320c05da6e6bd73d119dcae Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 11 Feb 2016 19:18:47 -0800
Subject: [PATCH] Fix NullPointerException

Change-Id: Ifce7af5ac6aacc04fb621f3afd707164f36ba980
---
 .../systemui/statusbar/phone/StatusBarIconController.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
index 4515ec8646907..f61f31e814f70 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
@@ -409,7 +409,11 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl
         if (darkArea == null && mTintArea.isEmpty()) {
             return;
         }
-        mTintArea.set(darkArea);
+        if (darkArea == null) {
+            mTintArea.setEmpty();
+        } else {
+            mTintArea.set(darkArea);
+        }
         applyIconTint();
         mNotificationIconAreaController.setTintArea(darkArea);
     }