commit 3fec14bedc03d77aa7a066a8053c6068dddda192
author Sunny Goyal <sunnygoyal@google.com> Thu Jul 16 01:03:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 16 01:03:00 2015 +0000
tree f3ceceaa1df56a8396d8a04eda44d615f97c5565
parent e48e570a82293d34e955b966c7821770600ec7bf
parent 1e23e4d24d937863ad6ba5950ba0051bbf534ba4

Merge "[DO NOT MERGE] fixing build break" into ub-launcher3-almonte

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 1a341e7..95cbb30 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2213,6 +2213,7 @@
                                 boolean customWidget = itemType ==
                                     LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
 
+                                id = c.getLong(idIndex);
                                 int appWidgetId = c.getInt(appWidgetIdIndex);
                                 serialNumber= c.getLong(profileIdIndex);
                                 user = mUserManager.getUserForSerialNumber(serialNumber);
@@ -2222,7 +2223,6 @@
                                     continue;
                                 }
                                 String savedProvider = c.getString(appWidgetProviderIndex);
-                                id = c.getLong(idIndex);
                                 final ComponentName component =
                                         ComponentName.unflattenFromString(savedProvider);