commit 438865cd8c0e91dee498fded880ce27a22539c86
author Dianne Hackborn <hackbod@google.com> Thu Mar 04 11:56:12 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 04 11:56:12 2010 -0800
tree 7ac52baddd0403b48a847fb6ae82aa90216c4777
parent 687c1330641b614e44c11842b37477666ae63c23
parent 20cb56e26e91df91bd64d4251222e0d421cdbe47

Merge "Fix some bugs."

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index d9f2739..442fc4f 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -74110,7 +74110,7 @@
  type="float"
  transient="false"
  volatile="false"
- value="0.0010f"
+ value="0.001f"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -85143,7 +85143,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="2"
+ value="4"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -85561,7 +85561,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="4"
+ value="2"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -213929,7 +213929,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
 </parameter>
 </method>
 </interface>

core/java/android/database/sqlite/SQLiteDatabase.java

diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 9fa9368..2974981 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -1542,7 +1542,6 @@
                 }
             }
             statement.execute();
-            statement.close();
             return lastChangeCount();
         } catch (SQLiteDatabaseCorruptException e) {
             onCorruption();
@@ -1638,7 +1637,6 @@
 
             // Run the program and then cleanup
             statement.execute();
-            statement.close();
             int numChangedRows = lastChangeCount();
             if (Config.LOGD && Log.isLoggable(TAG, Log.VERBOSE)) {
                 Log.v(TAG, "Updated " + numChangedRows + " using " + values + " and " + sql);