commit 687c1330641b614e44c11842b37477666ae63c23
author Ray Chen <raychen@google.com> Thu Mar 04 11:47:38 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 04 11:47:38 2010 -0800
tree f4a7b3f128cd7c75d237f9bf97eba8b1db2c3de8
parent 4c4106be3dd9eeb4e33bb60741eb1e07df64dda6
parent 8e060c0f67de3e158bd5609f7772d644fc88e1f2

Merge "Update current.xml to fix build error."

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);

core/tests/coretests/src/android/text/StaticLayoutBidiTest.java

diff --git a/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java b/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java
index da6036a..8e7e63e 100644
--- a/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java
+++ b/core/tests/coretests/src/android/text/StaticLayoutBidiTest.java
@@ -39,42 +39,42 @@
     public static final String GIMEL = "\u05d2";
     public static final String DALET = "\u05d3";
     
-    @SmallTest
+    //@SmallTest
     public void testAllLtr() {
         expectBidi(REQ_DL, "a test", "000000", L);
     }
     
-    @SmallTest
+    //@SmallTest
     public void testLtrRtl() {
         expectBidi(REQ_DL, "abc " + ALEF + BET + GIMEL, "0000111", L);
     }
     
-    @SmallTest
+    //@SmallTest
     public void testAllRtl() {
         expectBidi(REQ_DL, ALEF + SP + ALEF + BET + GIMEL + DALET, "111111", R);
     }
     
-    @SmallTest
+    //@SmallTest
     public void testRtlLtr() {
         expectBidi(REQ_DL,  ALEF + BET + GIMEL + " abc", "1111000", R);
     }
     
-    @SmallTest
+    //@SmallTest
     public void testRAllLtr() {
         expectBidi(REQ_R, "a test", "000000", R);
     }
     
-    @SmallTest
+    //@SmallTest
     public void testRLtrRtl() {
         expectBidi(REQ_R, "abc " + ALEF + BET + GIMEL, "0001111", R);
     }
     
-    @SmallTest
+    //@SmallTest
     public void testLAllRtl() {
         expectBidi(REQ_L, ALEF + SP + ALEF + BET + GIMEL + DALET, "111111", L);
     }
     
-    @SmallTest
+    //@SmallTest
     public void testLRtlLtr() {
         expectBidi(REQ_L,  ALEF + BET + GIMEL + " abc", "1110000", L);
     }
@@ -104,7 +104,7 @@
         assertEquals("levels", expectedLevels, resultLevels);
     }
     
-    @SmallTest
+    //@SmallTest
     public void testNativeBidi() {
         // native bidi returns levels, not simply directions
         expectNativeBidi(REQ_DL,  ALEF + BET + GIMEL + " abc", "1111222", R);