Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vasu Nori
2011-01-26 23:43:17 -08:00
committed by Android (Google) Code Review
parent c291a7bf7a 4b92aeec3f
commit d529d0df8f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/database/sqlite/SQLiteDatabase.java
View File

@@ -416,8 +416,7 @@ public class SQLiteDatabase extends SQLiteClosable {
private void lock(boolean forced) { private void lock(boolean forced) {
// make sure this method is NOT being called from a 'synchronized' method // make sure this method is NOT being called from a 'synchronized' method
if (Thread.holdsLock(this)) { if (Thread.holdsLock(this)) {
// STOPSHIP change the following line to Log.w() Log.w(TAG, "don't lock() while in a synchronized method");
throw new IllegalStateException("don't lock() while in a synchronized method");
} }
verifyDbIsOpen(); verifyDbIsOpen();
if (!forced && !mLockingEnabled) return; if (!forced && !mLockingEnabled) return;