diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-28 19:57:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 19:57:40 +0000 |
| commit | 108f5493edb50201d3dd2ba32a19db93edad8800 (patch) | |
| tree | 8da92cb26b15d10b38427056f69912c521e2791f /api | |
| parent | 359f1e91e5715644b0da4f01e58c994a9e4598aa (diff) | |
| parent | 3551a59b277fd4dc924f48116c153a50fb0913eb (diff) | |
| download | frameworks_base-108f5493edb50201d3dd2ba32a19db93edad8800.zip frameworks_base-108f5493edb50201d3dd2ba32a19db93edad8800.tar.gz frameworks_base-108f5493edb50201d3dd2ba32a19db93edad8800.tar.bz2 | |
am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '3551a59b277fd4dc924f48116c153a50fb0913eb':
Work on issue #21516866: Implement voice interaction in ResolverActivity
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(); |