diff --git a/src/com/android/launcher3/PageIndicatorMarker.java b/src/com/android/launcher3/PageIndicatorMarker.java index f012db74b0..7bf21dd905 100644 --- a/src/com/android/launcher3/PageIndicatorMarker.java +++ b/src/com/android/launcher3/PageIndicatorMarker.java @@ -45,6 +45,7 @@ public class PageIndicatorMarker extends FrameLayout { } protected void onFinishInflate() { + super.onFinishInflate(); mActiveMarker = (ImageView) findViewById(R.id.active); mInactiveMarker = (ImageView) findViewById(R.id.inactive); } diff --git a/src/com/android/launcher3/model/MigrateFromRestoreTask.java b/src/com/android/launcher3/model/MigrateFromRestoreTask.java index 6a529f61f7..ba33b02ce5 100644 --- a/src/com/android/launcher3/model/MigrateFromRestoreTask.java +++ b/src/com/android/launcher3/model/MigrateFromRestoreTask.java @@ -632,9 +632,9 @@ public class MigrateFromRestoreTask { mEntryToRemove.add(entry.id); continue; } - entries.add(entry); } + c.close(); return entries; } @@ -655,7 +655,7 @@ public class MigrateFromRestoreTask { mEntryToRemove.add(c.getLong(0)); } } - + c.close(); return total; }