Merge "Just get VoiceInteractionManagerService once in Activity.java" into tm-qpr-dev (52a7497f) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+11 −10

Original line number	Diff line number	Diff line
		@@ -997,6 +997,8 @@ public class Activity extends ContextThemeWrapper

		private ComponentCallbacksController mCallbacksController;

		@Nullable private IVoiceInteractionManagerService mVoiceInteractionManagerService;

		private final WindowControllerCallback mWindowControllerCallback =
		new WindowControllerCallback() {
		/**
		@@ -1606,18 +1608,17 @@ public class Activity extends ContextThemeWrapper

		private void notifyVoiceInteractionManagerServiceActivityEvent(
		@VoiceInteractionSession.VoiceInteractionActivityEventType int type) {

		final IVoiceInteractionManagerService service =
		IVoiceInteractionManagerService.Stub.asInterface(
		if (mVoiceInteractionManagerService == null) {
		mVoiceInteractionManagerService = IVoiceInteractionManagerService.Stub.asInterface(
		ServiceManager.getService(Context.VOICE_INTERACTION_MANAGER_SERVICE));
		if (service == null) {
		if (mVoiceInteractionManagerService == null) {
		Log.w(TAG, "notifyVoiceInteractionManagerServiceActivityEvent: Can not get "
		+ "VoiceInteractionManagerService");
		return;
		}

		}
		try {
		service.notifyActivityEventChanged(mToken, type);
		mVoiceInteractionManagerService.notifyActivityEventChanged(mToken, type);
		} catch (RemoteException e) {
		// Empty
		}