diff options
author | Winson Chung <winsonc@google.com> | 2015-07-30 12:03:28 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-07-30 12:05:41 -0700 |
commit | 70d5a07c5db9414742b0fd357d8ceb45c9f924ff (patch) | |
tree | c8641e09938d7b1b8023140de8f074d960d56ad3 | |
parent | fd69e0b527b7b6c0646072325fa232313e46bbc5 (diff) | |
download | android_packages_apps_Trebuchet-70d5a07c5db9414742b0fd357d8ceb45c9f924ff.tar.gz android_packages_apps_Trebuchet-70d5a07c5db9414742b0fd357d8ceb45c9f924ff.tar.bz2 android_packages_apps_Trebuchet-70d5a07c5db9414742b0fd357d8ceb45c9f924ff.zip |
Prevent crash when flattening ComponentKey to string with invalid user.
Bug: 22658306
Change-Id: I213d44e0bb22ac0617d46c80ab8cfec8f750a2cc
-rw-r--r-- | src/com/android/launcher3/util/ComponentKey.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/util/ComponentKey.java b/src/com/android/launcher3/util/ComponentKey.java index 6a7df4318..b7aafaea9 100644 --- a/src/com/android/launcher3/util/ComponentKey.java +++ b/src/com/android/launcher3/util/ComponentKey.java @@ -64,8 +64,11 @@ public class ComponentKey { * 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 |