Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e24c67e3 authored by Jeffrey Brown's avatar Jeffrey Brown Committed by Android Git Automerger
Browse files

am 2990ed7a: am 3c6ee5b5: am d2bec096: Merge "NullPointerException in SQLiteSession" 

# By László Dávid
# Via Android Git Automerger (2) and others
* commit '2990ed7a':
  NullPointerException in SQLiteSession
parents 6b7fcc8f 2990ed7a

core/java/android/database/sqlite/SQLiteSession.java

+1 −1
Original line number Diff line number Diff line
@@ -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.");

        }