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

Commit 7d073196 authored by Chris Thornton's avatar Chris Thornton Committed by android-build-merger
Browse files

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

am: ad5c30bd

Change-Id: I11f22f6f265564184cd22fd3286ebcf6b9e488e5
parents fc0aed25 ad5c30bd

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);