bug:3396894 (HC branch) remove STOPSHIP code
Change-Id: Iad8790b7c2efa3a9b35e07429ea47d4e9f72081b
diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index b1c84a1..1a43b30 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -416,8 +416,7 @@
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;