diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index b1c84a1159440..1a43b300f25db 100644
--- 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;