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

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

Browse Source 
* commit 'd529d0df8f2e93e0dc74887ab43eff46e07cef2e':
  bug:3396894  (HC branch) remove STOPSHIP code
This commit is contained in:
Vasu Nori
2011-01-26 23:45:27 -08:00
committed by Android Git Automerger
parent a7477f6b1c d529d0df8f
commit 7489a4709d
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) {
// 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;