am e931a72d: Handle same keyphrase for multiple users (e849e4aa) · Commits · e / os / android_frameworks_base

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

+61 −51

Original line number	Diff line number	Diff line
		@@ -41,12 +41,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		static final boolean DBG = true;

		private static final String NAME = "sound_model.db";
		private static final int VERSION = 3;
		private static final int VERSION = 4;

		public static interface SoundModelContract {
		public static final String TABLE = "sound_model";
		public static final String KEY_KEYPHRASE_ID = "keyphrase_id";
		public static final String KEY_MODEL_UUID = "model_uuid";
		public static final String KEY_KEYPHRASE_ID = "keyphrase_id";
		public static final String KEY_TYPE = "type";
		public static final String KEY_DATA = "data";
		public static final String KEY_RECOGNITION_MODES = "recognition_modes";
		@@ -58,8 +58,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		// Table Create Statement
		private static final String CREATE_TABLE_SOUND_MODEL = "CREATE TABLE "
		+ SoundModelContract.TABLE + "("
		+ SoundModelContract.KEY_KEYPHRASE_ID + " INTEGER PRIMARY KEY,"
		+ SoundModelContract.KEY_MODEL_UUID + " TEXT,"
		+ SoundModelContract.KEY_MODEL_UUID + " TEXT PRIMARY KEY,"
		+ SoundModelContract.KEY_KEYPHRASE_ID + " INTEGER,"
		+ SoundModelContract.KEY_TYPE + " INTEGER,"
		+ SoundModelContract.KEY_DATA + " BLOB,"
		+ SoundModelContract.KEY_RECOGNITION_MODES + " INTEGER,"
		@@ -122,10 +122,16 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		/**
		* Deletes the sound model and associated keyphrases.
		*/
		public boolean deleteKeyphraseSoundModel(int keyphraseId) {
		public boolean deleteKeyphraseSoundModel(UUID modelUuid) {
		if (modelUuid == null) {
		Slog.w(TAG, "Model UUID must be specified for deletion");
		return false;
		}

		synchronized(this) {
		SQLiteDatabase db = getWritableDatabase();
		String soundModelClause = SoundModelContract.KEY_KEYPHRASE_ID + "=" + keyphraseId;
		String soundModelClause = SoundModelContract.KEY_MODEL_UUID + "="
		+ modelUuid.toString();

		try {
		return db.delete(SoundModelContract.TABLE, soundModelClause, null) != 0;
		@@ -151,17 +157,18 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		try {
		if (c.moveToFirst()) {
		do {
		int type = c.getInt(c.getColumnIndex(SoundModelContract.KEY_TYPE));
		if (type != SoundTrigger.SoundModel.TYPE_KEYPHRASE) {
		Slog.w(TAG, "No KeyphraseSoundModel available for the given keyphrase");
		return null;
		Slog.w(TAG, "Ignoring sound model since it's type is incorrect");
		continue;
		}

		String modelUuid = c.getString(
		c.getColumnIndex(SoundModelContract.KEY_MODEL_UUID));
		if (modelUuid == null) {
		Slog.w(TAG, "Ignoring sound model since it doesn't specify an ID");
		return null;
		continue;
		}

		byte[] data = c.getBlob(c.getColumnIndex(SoundModelContract.KEY_DATA));
		@@ -169,7 +176,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		c.getColumnIndex(SoundModelContract.KEY_RECOGNITION_MODES));
		int[] users = getArrayForCommaSeparatedString(
		c.getString(c.getColumnIndex(SoundModelContract.KEY_USERS)));
		String locale = c.getString(c.getColumnIndex(SoundModelContract.KEY_LOCALE));
		String locale = c.getString(
		c.getColumnIndex(SoundModelContract.KEY_LOCALE));
		String text = c.getString(
		c.getColumnIndex(SoundModelContract.KEY_HINT_TEXT));

		@@ -177,8 +185,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		if (users == null) {
		// No users present in the keyphrase.
		Slog.w(TAG, "Ignoring keyphrase since it doesn't specify users");
		return null;
		continue;
		}

		boolean isAvailableForCurrentUser = false;
		int currentUser = mUserManager.getUserHandle();
		for (int user : users) {
		@@ -189,7 +198,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}
		if (!isAvailableForCurrentUser) {
		Slog.w(TAG, "Ignoring keyphrase since it's not for the current user");
		return null;
		continue;
		}

		Keyphrase[] keyphrases = new Keyphrase[1];
		@@ -197,6 +206,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		keyphraseId, recognitionModes, locale, text, users);
		return new KeyphraseSoundModel(UUID.fromString(modelUuid),
		null /* FIXME use vendor UUID */, data, keyphrases);
		} while (c.moveToNext());
		}
		Slog.w(TAG, "No SoundModel available for the given keyphrase");
		} finally {

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

+8 −5

Original line number	Diff line number	Diff line
		@@ -301,19 +301,22 @@ public class VoiceInteractionManagerService extends SystemService {
		}

		final long caller = Binder.clearCallingIdentity();
		boolean deleted = false;
		try {
		if (mDbHelper.deleteKeyphraseSoundModel(keyphraseId)) {
		KeyphraseSoundModel soundModel = mDbHelper.getKeyphraseSoundModel(keyphraseId);
		if (soundModel != null) {
		deleted = mDbHelper.deleteKeyphraseSoundModel(soundModel.uuid);
		}
		return deleted ? SoundTriggerHelper.STATUS_OK : SoundTriggerHelper.STATUS_ERROR;
		} finally {
		if (deleted) {
		synchronized (this) {
		// Notify the voice interaction service of a change in sound models.
		if (mImpl != null && mImpl.mService != null) {
		mImpl.notifySoundModelsChangedLocked();
		}
		}
		return SoundTriggerHelper.STATUS_OK;
		} else {
		return SoundTriggerHelper.STATUS_ERROR;
		}
		} finally {
		Binder.restoreCallingIdentity(caller);
		}
		}