diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-31 00:00:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-31 00:00:05 +0000 |
| commit | 00fcdc1236a8730d4c69c779a92b2c20cdb54be6 (patch) | |
| tree | aff1551b2b2b6d10ad6d9be066a1d54a294a7607 /core/java/com | |
| parent | 2921780f71bb269d96c444b282ef0b633f22f559 (diff) | |
| parent | 725010a83f1798e5ba6edb93ca2656a96c29fcae (diff) | |
| download | frameworks_base-00fcdc1236a8730d4c69c779a92b2c20cdb54be6.zip frameworks_base-00fcdc1236a8730d4c69c779a92b2c20cdb54be6.tar.gz frameworks_base-00fcdc1236a8730d4c69c779a92b2c20cdb54be6.tar.bz2 | |
am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev
* commit 'd6f7d9b75931d031086a744cfd18994b2673f311':
Clean up voice API.
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/app/IVoiceInteractor.aidl | 4 | ||||
| -rw-r--r-- | core/java/com/android/internal/app/IVoiceInteractorCallback.aidl | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/IVoiceInteractor.aidl b/core/java/com/android/internal/app/IVoiceInteractor.aidl index 737906a..2900595 100644 --- a/core/java/com/android/internal/app/IVoiceInteractor.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractor.aidl @@ -26,7 +26,9 @@ import com.android.internal.app.IVoiceInteractorRequest; */ interface IVoiceInteractor { IVoiceInteractorRequest startConfirmation(String callingPackage, - IVoiceInteractorCallback callback, String prompt, in Bundle extras); + IVoiceInteractorCallback callback, CharSequence prompt, in Bundle extras); + IVoiceInteractorRequest startAbortVoice(String callingPackage, + IVoiceInteractorCallback callback, CharSequence message, in Bundle extras); IVoiceInteractorRequest startCommand(String callingPackage, IVoiceInteractorCallback callback, String command, in Bundle extras); boolean[] supportsCommands(String callingPackage, in String[] commands); diff --git a/core/java/com/android/internal/app/IVoiceInteractorCallback.aidl b/core/java/com/android/internal/app/IVoiceInteractorCallback.aidl index c6f93e1..8dbf9d4 100644 --- a/core/java/com/android/internal/app/IVoiceInteractorCallback.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractorCallback.aidl @@ -26,6 +26,7 @@ import com.android.internal.app.IVoiceInteractorRequest; oneway interface IVoiceInteractorCallback { void deliverConfirmationResult(IVoiceInteractorRequest request, boolean confirmed, in Bundle result); + void deliverAbortVoiceResult(IVoiceInteractorRequest request, in Bundle result); void deliverCommandResult(IVoiceInteractorRequest request, boolean complete, in Bundle result); void deliverCancel(IVoiceInteractorRequest request); } |