diff options
| author | Jeffrey Brown <jeffbrown@android.com> | 2013-02-07 04:43:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-07 04:43:00 +0000 |
| commit | d2bec0960d04578182905b34795c6895760944dd (patch) | |
| tree | 13e57db6e0790c23194cafdbef9d071b41d369e1 /core/java/android/database | |
| parent | b9185fd1ffd85239e3ab10ab34cb9d8508970fb4 (diff) | |
| parent | 0b6cc9ace43b116ab74414f042429957fef439a0 (diff) | |
| download | frameworks_base-d2bec0960d04578182905b34795c6895760944dd.zip frameworks_base-d2bec0960d04578182905b34795c6895760944dd.tar.gz frameworks_base-d2bec0960d04578182905b34795c6895760944dd.tar.bz2 | |
Merge "NullPointerException in SQLiteSession"
Diffstat (limited to 'core/java/android/database')
| -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."); } |