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

Commit ad5c30bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE when updating models without a vendor UUID" into nyc-mr1-dev

parents f44feb36 174c5818

services/voiceinteraction/java/com/android/server/voiceinteraction/DatabaseHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -105,7 +105,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            SQLiteDatabase db = getWritableDatabase();

            ContentValues values = new ContentValues();

            values.put(SoundModelContract.KEY_MODEL_UUID, soundModel.uuid.toString());

            if (soundModel.vendorUuid != null) {

                values.put(SoundModelContract.KEY_VENDOR_UUID, soundModel.vendorUuid.toString());

            }

            values.put(SoundModelContract.KEY_TYPE, SoundTrigger.SoundModel.TYPE_KEYPHRASE);

            values.put(SoundModelContract.KEY_DATA, soundModel.data);