diff options
| author | Vasu Nori <vnori@google.com> | 2011-01-26 23:45:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 23:45:27 -0800 |
| commit | 7489a4709daf39aff61a17818de282d9ca4dc7c8 (patch) | |
| tree | 1d4c275b057c49336154e134e549a0448aa9c783 /core/java/android | |
| parent | a7477f6b1c2222bc2cc71416cad108adc0b6f0a3 (diff) | |
| parent | d529d0df8f2e93e0dc74887ab43eff46e07cef2e (diff) | |
| download | frameworks_base-7489a4709daf39aff61a17818de282d9ca4dc7c8.zip frameworks_base-7489a4709daf39aff61a17818de282d9ca4dc7c8.tar.gz frameworks_base-7489a4709daf39aff61a17818de282d9ca4dc7c8.tar.bz2 | |
am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
* commit 'd529d0df8f2e93e0dc74887ab43eff46e07cef2e':
bug:3396894 (HC branch) remove STOPSHIP code
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteDatabase.java | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ 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; |