summaryrefslogtreecommitdiffstats
path: root/services/voiceinteraction
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-01-14 15:15:34 -0800
committerDianne Hackborn <hackbod@google.com>2015-01-21 15:07:20 -0800
commit4e106cedfecd1f6026a79870c2e427853cba7491 (patch)
treea57b14230a1901e7b3f3e4a9ebed83274b8b5678 /services/voiceinteraction
parent4b94649ce3a57312e7a9bdbb256b5448b5bd8c32 (diff)
downloadframeworks_base-4e106cedfecd1f6026a79870c2e427853cba7491.zip
frameworks_base-4e106cedfecd1f6026a79870c2e427853cba7491.tar.gz
frameworks_base-4e106cedfecd1f6026a79870c2e427853cba7491.tar.bz2
Bring back voice interaction APIs.
Change-Id: I6039d7c0b188ac342441c56f7d19994b9a80ba17
Diffstat (limited to 'services/voiceinteraction')
-rw-r--r--services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index f5d4867..c32ba67 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -39,7 +39,6 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.Parcel;
import android.os.RemoteException;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.voice.IVoiceInteractionService;
@@ -426,9 +425,6 @@ public class VoiceInteractionManagerService extends SystemService {
final int callingPid = Binder.getCallingPid();
final int callingUid = Binder.getCallingUid();
final long caller = Binder.clearCallingIdentity();
- if (!SystemProperties.getBoolean("persist.test.voice_interaction", false)) {
- throw new SecurityException("Voice interaction not supported");
- }
try {
return mImpl.startVoiceActivityLocked(callingPid, callingUid, token,
intent, resolvedType);