commit c2d77a5bb0eabf3ed4b33cac1f9e67e3cb66296d
author Tony Wickham <twickham@google.com> Fri Oct 16 17:17:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 16 17:17:46 2015 +0000
tree 60b1d02ab1f3041dcfa61806bd3c34fe6d8f3e5e
parent 9ccb94b6e4613ee717550416db2b456d9f17702e
parent fb062c63355f65e6df9e99cbf4cce49cee2900d1

am fb062c63: Close some Cursors and call super.onFinishInflate().

* commit 'fb062c63355f65e6df9e99cbf4cce49cee2900d1':
  Close some Cursors and call super.onFinishInflate().

src/com/android/launcher3/PageIndicatorMarker.java

diff --git a/src/com/android/launcher3/PageIndicatorMarker.java b/src/com/android/launcher3/PageIndicatorMarker.java
index f012db7..7bf21dd 100644
--- a/src/com/android/launcher3/PageIndicatorMarker.java
+++ b/src/com/android/launcher3/PageIndicatorMarker.java
@@ -45,6 +45,7 @@
     }
 
     protected void onFinishInflate() {
+        super.onFinishInflate();
         mActiveMarker = (ImageView) findViewById(R.id.active);
         mInactiveMarker = (ImageView) findViewById(R.id.inactive);
     }

src/com/android/launcher3/model/MigrateFromRestoreTask.java

diff --git a/src/com/android/launcher3/model/MigrateFromRestoreTask.java b/src/com/android/launcher3/model/MigrateFromRestoreTask.java
index 6a529f6..ba33b02 100644
--- a/src/com/android/launcher3/model/MigrateFromRestoreTask.java
+++ b/src/com/android/launcher3/model/MigrateFromRestoreTask.java
@@ -632,9 +632,9 @@
                mEntryToRemove.add(entry.id);
                continue;
            }
-
            entries.add(entry);
        }
+       c.close();
        return entries;
     }
 
@@ -655,7 +655,7 @@
                 mEntryToRemove.add(c.getLong(0));
             }
         }
-
+        c.close();
         return total;
     }