Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb

2011-01-26 23:43:17 -08:00
parent c291a7bf7a 4b92aeec3f
commit d529d0df8f
1 changed files with 1 additions and 2 deletions
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -416,8 +416,7 @@ public class SQLiteDatabase extends SQLiteClosable {
    private void lock(boolean forced) {
        // make sure this method is NOT being called from a 'synchronized' method
        if (Thread.holdsLock(this)) {
-            // STOPSHIP change the following line to Log.w()
-            throw new IllegalStateException("don't lock() while in a synchronized method");
+            Log.w(TAG, "don't lock() while in a synchronized method");
        }
        verifyDbIsOpen();
        if (!forced && !mLockingEnabled) return;