summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/util
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-03-20 13:57:28 -0700
committerSunny Goyal <sunnygoyal@google.com>2017-03-20 15:13:51 -0700
commitb57645fcdb87847edd216e71e3b08107027e0ed3 (patch)
treed79d20c8dc7c042a49283373798d8fd23a366291 /src/com/android/launcher3/util
parentb00fcd4e49eae98304b98bde24804dc0dedcfbee (diff)
downloadandroid_packages_apps_Trebuchet-b57645fcdb87847edd216e71e3b08107027e0ed3.tar.gz
android_packages_apps_Trebuchet-b57645fcdb87847edd216e71e3b08107027e0ed3.tar.bz2
android_packages_apps_Trebuchet-b57645fcdb87847edd216e71e3b08107027e0ed3.zip
Removing config shortcut activities for managed profiles for
apps build with older sdk > Also fixing the bug where legacy icon with primary user gets created when managed user failed to provide the new icon Bug: 34392403 Change-Id: I1d56962e9520742781df6cbeb03be2b9767a8c0b
Diffstat (limited to 'src/com/android/launcher3/util')
-rw-r--r--src/com/android/launcher3/util/PendingRequestArgs.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/util/PendingRequestArgs.java b/src/com/android/launcher3/util/PendingRequestArgs.java
index 538e1df5b..dabd40df1 100644
--- a/src/com/android/launcher3/util/PendingRequestArgs.java
+++ b/src/com/android/launcher3/util/PendingRequestArgs.java
@@ -53,6 +53,7 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
public PendingRequestArgs(Parcel parcel) {
readFromValues(ContentValues.CREATOR.createFromParcel(parcel));
+ user = parcel.readParcelable(null);
mArg1 = parcel.readInt();
mObjectType = parcel.readInt();
@@ -69,6 +70,7 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
ContentValues itemValues = new ContentValues();
writeToValues(new ContentWriter(itemValues, null));
itemValues.writeToParcel(dest, flags);
+ dest.writeParcelable(user, flags);
dest.writeInt(mArg1);
dest.writeInt(mObjectType);