From ef39ce87d3d0270348b0ada1d6dc0a2b91ad33d9 Mon Sep 17 00:00:00 2001
From: Steve Pfetsch <spfetsch@google.com>
Date: Thu, 28 Jan 2016 18:41:19 -0800
Subject: Fixed NullPointerException in SystemUI

NullPointerException occurred on some devices during boot if no user
listener is attached to MultiUserSwitch.

Change-Id: Id6aabf81e0e982a4a6d88d78dcae639a7cbedee4
---
 .../src/com/android/systemui/statusbar/phone/MultiUserSwitch.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
index 8717a15aeef1..03dd25e3c5b0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
@@ -66,6 +66,9 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
     }
 
     public boolean hasMultipleUsers() {
+        if (mUserListener == null) {
+            return false;
+        }
         return mUserListener.getCount() != 0;
     }
 
-- 
cgit v1.2.3-59-g8ed1b