Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38a499ed authored May 18, 2015 by Dianne Hackborn

Remove screenshot APIs.

Change-Id: I1efdb7945bd52f5f43c7103480be3d7dac60018b

parent d5538758

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

api/system-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

core/java/android/service/voice/VoiceInteractionService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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.
		*/

core/java/android/service/voice/VoiceInteractionSession.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -820,6 +820,7 @@ public abstract class VoiceInteractionSession implements KeyEvent.Callback,
		public void onHandleAssist(Bundle assistBundle) {
		}

		/** @hide */
		public void onHandleScreenshot(Bitmap screenshot) {
		}

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,