commit 70d5a07c5db9414742b0fd357d8ceb45c9f924ff
author Winson Chung <winsonc@google.com> Thu Jul 30 12:03:28 2015 -0700
committer Winson Chung <winsonc@google.com> Thu Jul 30 12:05:41 2015 -0700
tree c8641e09938d7b1b8023140de8f074d960d56ad3
parent fd69e0b527b7b6c0646072325fa232313e46bbc5

Prevent crash when flattening ComponentKey to string with invalid user.

Bug: 22658306
Change-Id: I213d44e0bb22ac0617d46c80ab8cfec8f750a2cc

src/com/android/launcher3/util/ComponentKey.java

diff --git a/src/com/android/launcher3/util/ComponentKey.java b/src/com/android/launcher3/util/ComponentKey.java
index 6a7df43..b7aafae 100644
--- a/src/com/android/launcher3/util/ComponentKey.java
+++ b/src/com/android/launcher3/util/ComponentKey.java
@@ -64,8 +64,11 @@
      * Encodes a component key as a string of the form [flattenedComponentString#userId].
      */
     public String flattenToString(Context context) {
-        return componentName.flattenToString() + "#" +
-                UserManagerCompat.getInstance(context).getSerialNumberForUser(user);
+        String flattened = componentName.flattenToString();
+        if (user != null) {
+            flattened += "#" + UserManagerCompat.getInstance(context).getSerialNumberForUser(user);
+        }
+        return flattened;
     }
 
     @Override