diff options
| author | Jeffrey Brown <jeffbrown@android.com> | 2013-02-06 22:01:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-06 22:01:34 -0800 |
| commit | 3c6ee5b509d6360a431290fff4b366848c293899 (patch) | |
| tree | 57d4f3009da089d38d09b74738518515c864c440 /core/java/android | |
| parent | 7eb4db35935237a6bd029d5bafda97fa5d4d905c (diff) | |
| parent | d2bec0960d04578182905b34795c6895760944dd (diff) | |
| download | frameworks_base-3c6ee5b509d6360a431290fff4b366848c293899.zip frameworks_base-3c6ee5b509d6360a431290fff4b366848c293899.tar.gz frameworks_base-3c6ee5b509d6360a431290fff4b366848c293899.tar.bz2 | |
am d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Gerrit Code Review (1) and László Dávid (1)
* commit 'd2bec0960d04578182905b34795c6895760944dd':
NullPointerException in SQLiteSession
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteSession.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/database/sqlite/SQLiteSession.java b/core/java/android/database/sqlite/SQLiteSession.java index beb5b3a..d80ab1f 100644 --- a/core/java/android/database/sqlite/SQLiteSession.java +++ b/core/java/android/database/sqlite/SQLiteSession.java @@ -926,7 +926,7 @@ public final class SQLiteSession { } private void throwIfNestedTransaction() { - if (mTransactionStack == null && mTransactionStack.mParent != null) { + if (hasNestedTransaction()) { throw new IllegalStateException("Cannot perform this operation because " + "a nested transaction is in progress."); } |