diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-28 19:52:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 19:52:53 +0000 |
| commit | 3551a59b277fd4dc924f48116c153a50fb0913eb (patch) | |
| tree | b11c52818f7c6489071ce12d2d6f5ac069ba91cf /api | |
| parent | 850dd6907f87782474d4bc128c8c0137a9cc85fc (diff) | |
| parent | 57dd737443a174379eb638450e4888500d8e4a23 (diff) | |
| download | frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.zip frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.tar.gz frameworks_base-3551a59b277fd4dc924f48116c153a50fb0913eb.tar.bz2 | |
Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 1cee923..23c05dc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28812,6 +28812,7 @@ package android.service.voice { ctor public VoiceInteractionSession(android.content.Context); ctor public VoiceInteractionSession(android.content.Context, android.os.Handler); method public void closeSystemDialogs(); + method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]); method public void finish(); method public android.content.Context getContext(); method public int getDisabledShowContext(); diff --git a/api/system-current.txt b/api/system-current.txt index 8c44cfb..505802d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30964,6 +30964,7 @@ package android.service.voice { ctor public VoiceInteractionSession(android.content.Context); ctor public VoiceInteractionSession(android.content.Context, android.os.Handler); method public void closeSystemDialogs(); + method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]); method public void finish(); method public android.content.Context getContext(); method public int getDisabledShowContext(); |