summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorCedric Ho <cedricho@google.com>2015-05-27 17:46:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-27 17:46:41 +0000
commit2b919d4f69807528a11e38aee1a87507249d8319 (patch)
tree69766ce634c16adbdff21ed327b23dd2261c3910 /api
parent302abd22468367bcdeb1f85ea8014fe05ed95610 (diff)
parent8fedcdad3691e613ed192f4beea18926056d251d (diff)
downloadframeworks_base-2b919d4f69807528a11e38aee1a87507249d8319.zip
frameworks_base-2b919d4f69807528a11e38aee1a87507249d8319.tar.gz
frameworks_base-2b919d4f69807528a11e38aee1a87507249d8319.tar.bz2
Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index f59928d..aa29ae8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29028,6 +29028,7 @@ package android.speech {
method public void bufferReceived(byte[]) throws android.os.RemoteException;
method public void endOfSpeech() throws android.os.RemoteException;
method public void error(int) throws android.os.RemoteException;
+ method public int getCallingUid();
method public void partialResults(android.os.Bundle) throws android.os.RemoteException;
method public void readyForSpeech(android.os.Bundle) throws android.os.RemoteException;
method public void results(android.os.Bundle) throws android.os.RemoteException;
diff --git a/api/system-current.txt b/api/system-current.txt
index 3e6a6c1..0279b4a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -31154,6 +31154,7 @@ package android.speech {
method public void bufferReceived(byte[]) throws android.os.RemoteException;
method public void endOfSpeech() throws android.os.RemoteException;
method public void error(int) throws android.os.RemoteException;
+ method public int getCallingUid();
method public void partialResults(android.os.Bundle) throws android.os.RemoteException;
method public void readyForSpeech(android.os.Bundle) throws android.os.RemoteException;
method public void results(android.os.Bundle) throws android.os.RemoteException;