Merge "VoiceInteractionManagerService: userId vs. uid" (9e815e35) · Commits · e / os / android_frameworks_base

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

+11 −10

Original line number	Diff line number	Diff line
		@@ -967,10 +967,10 @@ public class VoiceInteractionManagerService extends SystemService {
		throw new IllegalArgumentException("Illegal argument(s) in getKeyphraseSoundModel");
		}

		final int callingUid = UserHandle.getCallingUserId();
		final int callingUserId = UserHandle.getCallingUserId();
		final long caller = Binder.clearCallingIdentity();
		try {
		return mDbHelper.getKeyphraseSoundModel(keyphraseId, callingUid, bcp47Locale);
		return mDbHelper.getKeyphraseSoundModel(keyphraseId, callingUserId, bcp47Locale);
		} finally {
		Binder.restoreCallingIdentity(caller);
		}
		@@ -1010,7 +1010,7 @@ public class VoiceInteractionManagerService extends SystemService {
		"Illegal argument(s) in deleteKeyphraseSoundModel");
		}

		final int callingUid = UserHandle.getCallingUserId();
		final int callingUserId = UserHandle.getCallingUserId();
		final long caller = Binder.clearCallingIdentity();
		boolean deleted = false;
		try {
		@@ -1018,7 +1018,8 @@ public class VoiceInteractionManagerService extends SystemService {
		if (unloadStatus != SoundTriggerInternal.STATUS_OK) {
		Slog.w(TAG, "Unable to unload keyphrase sound model:" + unloadStatus);
		}
		deleted = mDbHelper.deleteKeyphraseSoundModel(keyphraseId, callingUid, bcp47Locale);
		deleted = mDbHelper.deleteKeyphraseSoundModel(
		keyphraseId, callingUserId, bcp47Locale);
		return deleted ? SoundTriggerInternal.STATUS_OK : SoundTriggerInternal.STATUS_ERROR;
		} finally {
		if (deleted) {
		@@ -1045,11 +1046,11 @@ public class VoiceInteractionManagerService extends SystemService {
		throw new IllegalArgumentException("Illegal argument(s) in isEnrolledForKeyphrase");
		}

		final int callingUid = UserHandle.getCallingUserId();
		final int callingUserId = UserHandle.getCallingUserId();
		final long caller = Binder.clearCallingIdentity();
		try {
		KeyphraseSoundModel model =
		mDbHelper.getKeyphraseSoundModel(keyphraseId, callingUid, bcp47Locale);
		mDbHelper.getKeyphraseSoundModel(keyphraseId, callingUserId, bcp47Locale);
		return model != null;
		} finally {
		Binder.restoreCallingIdentity(caller);
		@@ -1067,11 +1068,11 @@ public class VoiceInteractionManagerService extends SystemService {
		throw new IllegalArgumentException("Illegal argument(s) in isEnrolledForKeyphrase");
		}

		final int callingUid = UserHandle.getCallingUserId();
		final int callingUserId = UserHandle.getCallingUserId();
		final long caller = Binder.clearCallingIdentity();
		try {
		KeyphraseSoundModel model =
		mDbHelper.getKeyphraseSoundModel(keyphrase, callingUid, bcp47Locale);
		mDbHelper.getKeyphraseSoundModel(keyphrase, callingUserId, bcp47Locale);
		if (model == null) {
		return null;
		}
		@@ -1118,11 +1119,11 @@ public class VoiceInteractionManagerService extends SystemService {
		}
		}

		int callingUid = UserHandle.getCallingUserId();
		final int callingUserId = UserHandle.getCallingUserId();
		final long caller = Binder.clearCallingIdentity();
		try {
		KeyphraseSoundModel soundModel =
		mDbHelper.getKeyphraseSoundModel(keyphraseId, callingUid, bcp47Locale);
		mDbHelper.getKeyphraseSoundModel(keyphraseId, callingUserId, bcp47Locale);
		if (soundModel == null
		\|\| soundModel.getUuid() == null
		\|\| soundModel.getKeyphrases() == null) {