From fb062c63355f65e6df9e99cbf4cce49cee2900d1 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Fri, 16 Oct 2015 10:12:23 -0700 Subject: [PATCH] Close some Cursors and call super.onFinishInflate(). Android Studio gave these warnings, and they seem like good ideas. Change-Id: I9a4d3997fd18e86e007e4511e1ac9e8a75509265 --- src/com/android/launcher3/PageIndicatorMarker.java | 1 + src/com/android/launcher3/model/MigrateFromRestoreTask.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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; }