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

Commit c8195ffc authored by Vasu Nori's avatar Vasu Nori Committed by Android (Google) Code Review
Browse files

Merge "rollback AFTER commit causes warning message from sqlite bug:2486731"

parents 68da044d 78f307d2

core/jni/android_database_SQLiteDatabase.cpp

+4 −2
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static void native_setLocale(JNIEnv* env, jobject object, jstring localeString, 
    if (err != SQLITE_OK) {

        LOGE("register_localized_collators() failed setting locale\n");

        throw_sqlite3_exception(env, handle);

        goto done;

        goto rollback;

    }



    err = sqlite3_exec(handle, "DELETE FROM " ANDROID_TABLE, NULL, NULL, NULL);
@@ -415,7 +415,9 @@ static void native_setLocale(JNIEnv* env, jobject object, jstring localeString, 
    }



rollback:

    if (err != SQLITE_OK) {

        sqlite3_exec(handle, "ROLLBACK TRANSACTION", NULL, NULL, NULL);

    }



done:

    if (locale8 != NULL) env->ReleaseStringUTFChars(localeString, locale8);