diff options
| author | Vasu Nori <vnori@google.com> | 2011-01-26 23:43:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-26 23:43:17 -0800 |
| commit | d529d0df8f2e93e0dc74887ab43eff46e07cef2e (patch) | |
| tree | 0f18da3f7d3ca370ee2075a104552b1fb8852e18 /core | |
| parent | c291a7bf7a163cea10be135279103f72a6418383 (diff) | |
| parent | 4b92aeec3faa459507f297ce49b2a2d4daaa4e47 (diff) | |
| download | frameworks_base-d529d0df8f2e93e0dc74887ab43eff46e07cef2e.zip frameworks_base-d529d0df8f2e93e0dc74887ab43eff46e07cef2e.tar.gz frameworks_base-d529d0df8f2e93e0dc74887ab43eff46e07cef2e.tar.bz2 | |
Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
Diffstat (limited to 'core')
| -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; |