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

Commit 6cbfa798 authored by Kenny Guy's avatar Kenny Guy
Browse files

Update SQLiteQueryBuilder to match aosp-master and internal master 

SQLiteQueryBuilder.appendWhere and appendWhereEscapeString
has @NonNull in master and aosp-master however not in staging.
This breaks the build in staging now the tool that generates
current.txt includes annotations in the signatures.

Test: lunch aosp_taimen-userdebug && make -j
Change-Id: Iea1728a13f2ed651533328b09517dfb6ad381130
parent 346e7b65

core/java/android/database/sqlite/SQLiteQueryBuilder.java

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package android.database.sqlite;



import android.annotation.UnsupportedAppUsage;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.content.ContentValues;

import android.database.Cursor;

import android.database.DatabaseUtils;
@@ -104,7 +104,7 @@ public class SQLiteQueryBuilder 
     *

     * @param inWhere the chunk of text to append to the WHERE clause.

     */

    public void appendWhere(CharSequence inWhere) {

    public void appendWhere(@NonNull CharSequence inWhere) {

        if (mWhereClause == null) {

            mWhereClause = new StringBuilder(inWhere.length() + 16);

        }
@@ -121,7 +121,7 @@ public class SQLiteQueryBuilder 
     * @param inWhere the chunk of text to append to the WHERE clause. it will be escaped

     * to avoid SQL injection attacks

     */

    public void appendWhereEscapeString(String inWhere) {

    public void appendWhereEscapeString(@NonNull String inWhere) {

        if (mWhereClause == null) {

            mWhereClause = new StringBuilder(inWhere.length() + 16);

        }