summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-05-18 17:48:40 -0700
committerDianne Hackborn <hackbod@google.com>2015-05-18 17:48:40 -0700
commit38a499edf5542fbd0948a02b77ecd84c0d62a846 (patch)
treeb387fdbfe9ad8eaa4b9e22275fe5f011ee527ecd
parentd5538758af0f6fea0695d3682e9aad2613ab9192 (diff)
downloadframeworks_base-38a499edf5542fbd0948a02b77ecd84c0d62a846.zip
frameworks_base-38a499edf5542fbd0948a02b77ecd84c0d62a846.tar.gz
frameworks_base-38a499edf5542fbd0948a02b77ecd84c0d62a846.tar.bz2
Remove screenshot APIs.
Change-Id: I1efdb7945bd52f5f43c7103480be3d7dac60018b
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--core/java/android/service/voice/VoiceInteractionService.java1
-rw-r--r--core/java/android/service/voice/VoiceInteractionSession.java1
-rw-r--r--services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java2
5 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 50147d8..231be10 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28891,7 +28891,6 @@ package android.service.voice {
field public static final java.lang.String SERVICE_META_DATA = "android.voice_interaction";
field public static final int START_SOURCE_ASSIST_GESTURE = 4; // 0x4
field public static final int START_WITH_ASSIST = 1; // 0x1
- field public static final int START_WITH_SCREENSHOT = 2; // 0x2
}
public abstract class VoiceInteractionSession implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback {
@@ -28917,7 +28916,6 @@ package android.service.voice {
method public void onDestroy();
method public boolean[] onGetSupportedCommands(android.service.voice.VoiceInteractionSession.Caller, java.lang.String[]);
method public void onHandleAssist(android.os.Bundle);
- method public void onHandleScreenshot(android.graphics.Bitmap);
method public void onHide();
method public boolean onKeyDown(int, android.view.KeyEvent);
method public boolean onKeyLongPress(int, android.view.KeyEvent);
diff --git a/api/system-current.txt b/api/system-current.txt
index d2e0556..3209169 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -31020,7 +31020,6 @@ package android.service.voice {
field public static final java.lang.String SERVICE_META_DATA = "android.voice_interaction";
field public static final int START_SOURCE_ASSIST_GESTURE = 4; // 0x4
field public static final int START_WITH_ASSIST = 1; // 0x1
- field public static final int START_WITH_SCREENSHOT = 2; // 0x2
}
public abstract class VoiceInteractionSession implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback {
@@ -31046,7 +31045,6 @@ package android.service.voice {
method public void onDestroy();
method public boolean[] onGetSupportedCommands(android.service.voice.VoiceInteractionSession.Caller, java.lang.String[]);
method public void onHandleAssist(android.os.Bundle);
- method public void onHandleScreenshot(android.graphics.Bitmap);
method public void onHide();
method public boolean onKeyDown(int, android.view.KeyEvent);
method public boolean onKeyLongPress(int, android.view.KeyEvent);
diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java
index 8c89ddb..77e2125 100644
--- a/core/java/android/service/voice/VoiceInteractionService.java
+++ b/core/java/android/service/voice/VoiceInteractionService.java
@@ -77,6 +77,7 @@ public class VoiceInteractionService extends Service {
public static final int START_WITH_ASSIST = 1<<0;
/**
+ * @hide
* Flag for use with {@link #showSession}: request that the session be started with
* a screen shot of the currently focused activity.
*/
diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java
index 71b7f76..f122d10 100644
--- a/core/java/android/service/voice/VoiceInteractionSession.java
+++ b/core/java/android/service/voice/VoiceInteractionSession.java
@@ -820,6 +820,7 @@ public abstract class VoiceInteractionSession implements KeyEvent.Callback,
public void onHandleAssist(Bundle assistBundle) {
}
+ /** @hide */
public void onHandleScreenshot(Bitmap screenshot) {
}
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
index 42eb6c3..d79b31c 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
@@ -177,6 +177,8 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
public boolean showLocked(Bundle args, int flags,
IVoiceInteractionSessionShowCallback showCallback) {
+ // For now we never allow screenshots.
+ flags &= ~VoiceInteractionService.START_WITH_SCREENSHOT;
if (mBound) {
if (!mFullyBound) {
mFullyBound = mContext.bindServiceAsUser(mBindIntent, mFullConnection,