diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-08-29 17:32:04 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2014-09-02 10:29:28 -0700 |
commit | d7c0395d26694c594c3e64b16ab647c971aeb422 (patch) | |
tree | 14e3e6765760116dc6e95607702e226ff99bd676 /core/java/android/app/Activity.java | |
parent | 78358b17885cfb99f359f54c11565c0c3a998928 (diff) | |
download | frameworks_base-d7c0395d26694c594c3e64b16ab647c971aeb422.zip frameworks_base-d7c0395d26694c594c3e64b16ab647c971aeb422.tar.gz frameworks_base-d7c0395d26694c594c3e64b16ab647c971aeb422.tar.bz2 |
Hide the interaction part of VoiceInteractionService.
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.
Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
Diffstat (limited to 'core/java/android/app/Activity.java')
-rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 2503d17..8ab344e 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1236,18 +1236,22 @@ public class Activity extends ContextThemeWrapper } /** + * @hide * Check whether this activity is running as part of a voice interaction with the user. * If true, it should perform its interaction with the user through the * {@link VoiceInteractor} returned by {@link #getVoiceInteractor}. */ + @SystemApi public boolean isVoiceInteraction() { return mVoiceInteractor != null; } /** + * @hide * Retrieve the active {@link VoiceInteractor} that the user is going through to * interact with this activity. */ + @SystemApi public VoiceInteractor getVoiceInteractor() { return mVoiceInteractor; } |