diff options
| author | Vasu Nori <vnori@google.com> | 2011-01-26 23:22:34 -0800 |
|---|---|---|
| committer | Vasu Nori <vnori@google.com> | 2011-01-26 23:24:05 -0800 |
| commit | 4b92aeec3faa459507f297ce49b2a2d4daaa4e47 (patch) | |
| tree | a412792f3f5bd7d479291fdc5368d522a6395d9d /core/java/android | |
| parent | 41f4241240798be91adcff7181e5a3adf651da55 (diff) | |
| download | frameworks_base-4b92aeec3faa459507f297ce49b2a2d4daaa4e47.zip frameworks_base-4b92aeec3faa459507f297ce49b2a2d4daaa4e47.tar.gz frameworks_base-4b92aeec3faa459507f297ce49b2a2d4daaa4e47.tar.bz2 | |
bug:3396894 (HC branch) remove STOPSHIP code
Change-Id: Iad8790b7c2efa3a9b35e07429ea47d4e9f72081b
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; |