Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0

1 files changed, 0 insertions, 7 deletions

diff --git a/packages/WAPPushManager/src/com/android/smspush/WapPushManager.java b/packages/WAPPushManager/src/com/android/smspush/WapPushManager.java
index e970367..96d29fd 100644
--- a/packages/WAPPushManager/src/com/android/smspush/WapPushManager.java
+++ b/packages/WAPPushManager/src/com/android/smspush/WapPushManager.java
@@ -185,7 +185,6 @@ public class WapPushManager extends Service {
             WapPushManDBHelper dbh = getDatabase(mContext);
             SQLiteDatabase db = dbh.getReadableDatabase();
             WapPushManDBHelper.queryData lastapp = dbh.queryLastApp(db, app_id, content_type);
-            db.close();
 
             if (lastapp == null) {
                 Log.w(LOG_TAG, "no receiver app found for " + app_id + ":" + content_type);
@@ -284,7 +283,6 @@ public class WapPushManager extends Service {
                 ret = true;
             }
 
-            db.close();
 
             return ret;
         }
@@ -308,7 +306,6 @@ public class WapPushManager extends Service {
             WapPushManDBHelper.queryData lastapp = dbh.queryLastApp(db, x_app_id, content_type);
 
             if (lastapp == null) {
-                db.close();
                 return false;
             }
 
@@ -328,7 +325,6 @@ public class WapPushManager extends Service {
                     + package_name + "." + class_name
                     + ", sq:" + lastapp.installOrder);
 
-            db.close();
 
             return num > 0;
         }
@@ -346,7 +342,6 @@ public class WapPushManager extends Service {
                     + " and class_name=\'" + class_name + "\'";
             int num_removed = db.delete(APPID_TABLE_NAME, where, null);
 
-            db.close();
             if (LOCAL_LOGV) Log.v(LOG_TAG, "deleted " + num_removed + " rows:"
                     + x_app_id + ":" + content_type + " "
                     + package_name + "." + class_name);
@@ -399,7 +394,6 @@ public class WapPushManager extends Service {
         if (LOCAL_LOGV) Log.v(LOG_TAG, "verifyData app id: " + x_app_id + " content type: " +
                 content_type + " lastapp: " + lastapp);
 
-        db.close();
 
         if (lastapp == null) return false;
 
@@ -430,7 +424,6 @@ public class WapPushManager extends Service {
         SQLiteDatabase db = dbh.getReadableDatabase();
         boolean ret = dbh.queryLastApp(db, x_app_id, content_type) != null;
 
-        db.close();
         return ret;
     }