commit 9ad66d365b09653df68851e779ccae78c458d8d3
author Steve Pfetsch <spfetsch@google.com> Fri Jan 29 17:59:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 29 17:59:47 2016 +0000
tree b26136e2d86450c3cd2de46b1df17b29edb38882
parent a0a583656244bf5f5b9336297dffe8da6da2ce69
parent ef39ce87d3d0270348b0ada1d6dc0a2b91ad33d9

Merge "Fixed NullPointerException in SystemUI"

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

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 8717a15..03dd25e3c 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 boolean hasMultipleUsers() {
+        if (mUserListener == null) {
+            return false;
+        }
         return mUserListener.getCount() != 0;
     }