Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev (80abf887) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5805,7 +5805,7 @@ package android.app.admin {

		package android.app.assist {

		public deprecated class AssistContent implements android.os.Parcelable {
		public class AssistContent implements android.os.Parcelable {
		ctor public AssistContent();
		method public int describeContents();
		method public android.content.ClipData getClipData();

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5937,7 +5937,7 @@ package android.app.admin {

		package android.app.assist {

		public deprecated class AssistContent implements android.os.Parcelable {
		public class AssistContent implements android.os.Parcelable {
		ctor public AssistContent();
		method public int describeContents();
		method public android.content.ClipData getClipData();

core/java/android/app/assist/AssistContent.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ import android.os.Parcelable;
		* assistant at the user's request. This is filled in by
		* {@link android.app.Activity#onProvideAssistContent Activity.onProvideAssistContent}.
		*/
		@Deprecated
		public class AssistContent implements Parcelable {
		private boolean mIsAppProvidedIntent = false;
		private Intent mIntent;

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -172,15 +172,6 @@ public class VoiceInteractionService extends Service {
		}
		}

		/** @hide */
		public void startSession(Bundle args, int flags) {
		showSession(args, flags);
		}
		/** @hide */
		public void startSession(Bundle args) {
		startSession(args, 0);
		}

		@Override
		public void onCreate() {
		super.onCreate();

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

+55 −140

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
		*/
		public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCallbacks2 {
		static final String TAG = "VoiceInteractionSession";
		static final boolean DEBUG = true;
		static final boolean DEBUG = false;

		/**
		* Flag received in {@link #onShow}: originator requested that the session be started with
		@@ -175,6 +175,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		CommandRequest request = new CommandRequest(callingPackage,
		Binder.getCallingUid(), callback, VoiceInteractionSession.this,
		command, extras);
		addRequest(request);
		mHandlerCaller.sendMessage(mHandlerCaller.obtainMessageO(MSG_START_COMMAND,
		request));
		return request.mInterface;
		@@ -249,16 +250,12 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		}
		};

		/** @hide */
		public static class Caller {
		}

		/**
		* Base class representing a request from a voice-driver app to perform a particular
		* voice operation with the user. See related subclasses for the types of requests
		* that are possible.
		*/
		public static class Request extends Caller {
		public static class Request {
		final IVoiceInteractorRequest mInterface = new IVoiceInteractorRequest.Stub() {
		@Override
		public void cancel() throws RemoteException {
		@@ -319,74 +316,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		}
		}

		/** @hide */
		public void sendConfirmResult(boolean confirmed, Bundle result) {
		try {
		if (DEBUG) Log.d(TAG, "sendConfirmResult: req=" + mInterface
		+ " confirmed=" + confirmed + " result=" + result);
		finishRequest();
		mCallback.deliverConfirmationResult(mInterface, confirmed, result);
		} catch (RemoteException e) {
		}
		}

		/** @hide */
		public void sendPickOptionResult(boolean finished,
		VoiceInteractor.PickOptionRequest.Option[] selections, Bundle result) {
		try {
		if (DEBUG) Log.d(TAG, "sendPickOptionResult: req=" + mInterface
		+ " finished=" + finished + " selections=" + selections
		+ " result=" + result);
		if (finished) {
		finishRequest();
		}
		mCallback.deliverPickOptionResult(mInterface, finished, selections, result);
		} catch (RemoteException e) {
		}
		}

		/** @hide */
		public void sendCompleteVoiceResult(Bundle result) {
		try {
		if (DEBUG) Log.d(TAG, "sendCompleteVoiceResult: req=" + mInterface
		+ " result=" + result);
		finishRequest();
		mCallback.deliverCompleteVoiceResult(mInterface, result);
		} catch (RemoteException e) {
		}
		}

		/** @hide */
		public void sendAbortVoiceResult(Bundle result) {
		try {
		if (DEBUG) Log.d(TAG, "sendConfirmResult: req=" + mInterface
		+ " result=" + result);
		finishRequest();
		mCallback.deliverAbortVoiceResult(mInterface, result);
		} catch (RemoteException e) {
		}
		}

		/** @hide */
		public void sendCommandResult(boolean finished, Bundle result) {
		try {
		if (DEBUG) Log.d(TAG, "sendCommandResult: req=" + mInterface
		+ " result=" + result);
		if (finished) {
		finishRequest();
		}
		mCallback.deliverCommandResult(mInterface, finished, result);
		} catch (RemoteException e) {
		}
		}

		/** @hide */
		public void sendCancelResult() {
		cancel();
		}

		/**
		* ASk the app to cancelLocked this current request.
		* Ask the app to cancel this current request.
		*/
		public void cancel() {
		try {
		@@ -440,7 +371,13 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* VoiceInteractor.ConfirmationRequest.onConfirmationResult}.
		*/
		public void sendConfirmationResult(boolean confirmed, Bundle result) {
		sendConfirmResult(confirmed, result);
		try {
		if (DEBUG) Log.d(TAG, "sendConfirmationResult: req=" + mInterface
		+ " confirmed=" + confirmed + " result=" + result);
		finishRequest();
		mCallback.deliverConfirmationResult(mInterface, confirmed, result);
		} catch (RemoteException e) {
		}
		}
		}

		@@ -487,6 +424,20 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		return mOptions;
		}

		void sendPickOptionResult(boolean finished,
		VoiceInteractor.PickOptionRequest.Option[] selections, Bundle result) {
		try {
		if (DEBUG) Log.d(TAG, "sendPickOptionResult: req=" + mInterface
		+ " finished=" + finished + " selections=" + selections
		+ " result=" + result);
		if (finished) {
		finishRequest();
		}
		mCallback.deliverPickOptionResult(mInterface, finished, selections, result);
		} catch (RemoteException e) {
		}
		}

		/**
		* Report an intermediate option selection from the request, without completing it (the
		* request is still active and the app is waiting for the final option selection),
		@@ -553,7 +504,13 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* VoiceInteractor.CompleteVoiceRequest.onCompleteResult}.
		*/
		public void sendCompleteResult(Bundle result) {
		sendCompleteVoiceResult(result);
		try {
		if (DEBUG) Log.d(TAG, "sendCompleteVoiceResult: req=" + mInterface
		+ " result=" + result);
		finishRequest();
		mCallback.deliverCompleteVoiceResult(mInterface, result);
		} catch (RemoteException e) {
		}
		}
		}

		@@ -596,7 +553,13 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* VoiceInteractor.AbortVoiceRequest.onAbortResult}.
		*/
		public void sendAbortResult(Bundle result) {
		sendAbortVoiceResult(result);
		try {
		if (DEBUG) Log.d(TAG, "sendConfirmResult: req=" + mInterface
		+ " result=" + result);
		finishRequest();
		mCallback.deliverAbortVoiceResult(mInterface, result);
		} catch (RemoteException e) {
		}
		}
		}

		@@ -621,6 +584,18 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		return mCommand;
		}

		void sendCommandResult(boolean finished, Bundle result) {
		try {
		if (DEBUG) Log.d(TAG, "sendCommandResult: req=" + mInterface
		+ " result=" + result);
		if (finished) {
		finishRequest();
		}
		mCallback.deliverCommandResult(mInterface, finished, result);
		} catch (RemoteException e) {
		}
		}

		/**
		* Report an intermediate result of the request, without completing it (the request
		* is still active and the app is waiting for the final result), resulting in a call to
		@@ -829,11 +804,10 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		}
		}

		void doCreate(IVoiceInteractionManagerService service, IBinder token, Bundle args,
		int startFlags) {
		void doCreate(IVoiceInteractionManagerService service, IBinder token) {
		mSystemService = service;
		mToken = token;
		onCreate(args, startFlags);
		onCreate();
		}

		void doShow(Bundle args, int flags, final IVoiceInteractionSessionShowCallback showCallback) {
		@@ -919,11 +893,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		mContentFrame = (FrameLayout)mRootView.findViewById(android.R.id.content);
		}

		/** @hide */
		public void show() {
		show(null, 0);
		}

		/**
		* Show the UI for this session. This asks the system to go through the process of showing
		* your UI, which will eventually culminate in {@link #onShow}. This is similar to calling
		@@ -958,14 +927,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		}
		}

		/** @hide */
		public void showWindow() {
		}

		/** @hide */
		public void hideWindow() {
		}

		/**
		* You can call this to customize the theme used by your IME's window.
		* This must be set before {@link #onCreate}, so you
		@@ -1062,7 +1023,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		if (mToken == null) {
		throw new IllegalStateException("Can't call before onCreate()");
		}
		hideWindow();
		try {
		mSystemService.finish(mToken);
		} catch (RemoteException e) {
		@@ -1077,16 +1037,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		doOnCreate();
		}

		/** @hide */
		public void onCreate(Bundle args) {
		doOnCreate();
		}

		/** @hide */
		public void onCreate(Bundle args, int showFlags) {
		doOnCreate();
		}

		private void doOnCreate() {
		mTheme = mTheme != 0 ? mTheme
		: com.android.internal.R.style.Theme_DeviceDefault_VoiceInteractionSession;
		@@ -1244,34 +1194,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		hide();
		}

		/** @hide */
		public boolean[] onGetSupportedCommands(Caller caller, String[] commands) {
		return new boolean[commands.length];
		}
		/** @hide */
		public void onConfirm(Caller caller, Request request, CharSequence prompt,
		Bundle extras) {
		}
		/** @hide */
		public void onPickOption(Caller caller, Request request, CharSequence prompt,
		VoiceInteractor.PickOptionRequest.Option[] options, Bundle extras) {
		}
		/** @hide */
		public void onCompleteVoice(Caller caller, Request request, CharSequence message,
		Bundle extras) {
		request.sendCompleteVoiceResult(null);
		}
		/** @hide */
		public void onAbortVoice(Caller caller, Request request, CharSequence message, Bundle extras) {
		request.sendAbortVoiceResult(null);
		}
		/** @hide */
		public void onCommand(Caller caller, Request request, String command, Bundle extras) {
		}
		/** @hide */
		public void onCancel(Request request) {
		}

		/**
		* Request to query for what extended commands the session supports.
		*
		@@ -1282,7 +1204,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* an array of all false entries.
		*/
		public boolean[] onGetSupportedCommands(String[] commands) {
		return onGetSupportedCommands(new Caller(), commands);
		return new boolean[commands.length];
		}

		/**
		@@ -1293,7 +1215,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* @param request The active request.
		*/
		public void onRequestConfirmation(ConfirmationRequest request) {
		onConfirm(request, request, request.getPrompt(), request.getExtras());
		}

		/**
		@@ -1303,8 +1224,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* @param request The active request.
		*/
		public void onRequestPickOption(PickOptionRequest request) {
		onPickOption(request, request, request.getPrompt(), request.getOptions(),
		request.getExtras());
		}

		/**
		@@ -1317,7 +1236,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* @param request The active request.
		*/
		public void onRequestCompleteVoice(CompleteVoiceRequest request) {
		onCompleteVoice(request, request, request.getMessage(), request.getExtras());
		}

		/**
		@@ -1330,7 +1248,6 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* @param request The active request.
		*/
		public void onRequestAbortVoice(AbortVoiceRequest request) {
		onAbortVoice(request, request, request.getMessage(), request.getExtras());
		}

		/**
		@@ -1341,11 +1258,10 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* @param request The active request.
		*/
		public void onRequestCommand(CommandRequest request) {
		onCommand(request, request, request.getCommand(), request.getExtras());
		}

		/**
		* Called when the {@link android.app.VoiceInteractor} has asked to cancelLocked a {@link Request}
		* Called when the {@link android.app.VoiceInteractor} has asked to cancel a {@link Request}
		* that was previously delivered to {@link #onRequestConfirmation},
		* {@link #onRequestPickOption}, {@link #onRequestCompleteVoice}, {@link #onRequestAbortVoice},
		* or {@link #onRequestCommand}.
		@@ -1353,6 +1269,5 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		* @param request The request that is being canceled.
		*/
		public void onCancelRequest(Request request) {
		onCancel(request);
		}
		}