diff options
| author | Winson Chung <winsonc@google.com> | 2015-07-30 23:46:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-30 23:46:11 +0000 |
| commit | 1014e7de0e6c62587b507342f8b477ea84fa635d (patch) | |
| tree | 03b5b792893791a30957ec4f79cae687a91a99d0 | |
| parent | 176196c0acae9872cf2d32446e558bd381a9bafa (diff) | |
| parent | 70d5a07c5db9414742b0fd357d8ceb45c9f924ff (diff) | |
| download | android_packages_apps_Trebuchet-1014e7de0e6c62587b507342f8b477ea84fa635d.tar.gz android_packages_apps_Trebuchet-1014e7de0e6c62587b507342f8b477ea84fa635d.tar.bz2 android_packages_apps_Trebuchet-1014e7de0e6c62587b507342f8b477ea84fa635d.zip | |
Merge "Prevent crash when flattening ComponentKey to string with invalid user." into ub-launcher3-burnaby
| -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 |