Merge "Fix SysUI crashes on svelte devices" into mnc-dev (8924f23d) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/AssistUtils.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -49,8 +49,10 @@ public class AssistUtils {
		public boolean showSessionForActiveService(Bundle args, int sourceFlags,
		IVoiceInteractionSessionShowCallback showCallback, IBinder activityToken) {
		try {
		return mVoiceInteractionManagerService.showSessionForActiveService(args, sourceFlags,
		showCallback, activityToken);
		if (mVoiceInteractionManagerService != null) {
		return mVoiceInteractionManagerService.showSessionForActiveService(args,
		sourceFlags, showCallback, activityToken);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "Failed to call showSessionForActiveService", e);
		}
		@@ -59,7 +61,9 @@ public class AssistUtils {

		public void launchVoiceAssistFromKeyguard() {
		try {
		if (mVoiceInteractionManagerService != null) {
		mVoiceInteractionManagerService.launchVoiceAssistFromKeyguard();
		}
		} catch (RemoteException e) {
		Log.w(TAG, "Failed to call launchVoiceAssistFromKeyguard", e);
		}
		@@ -87,7 +91,11 @@ public class AssistUtils {

		public ComponentName getActiveServiceComponentName() {
		try {
		if (mVoiceInteractionManagerService != null) {
		return mVoiceInteractionManagerService.getActiveServiceComponentName();
		} else {
		return null;
		}
		} catch (RemoteException e) {
		Log.w(TAG, "Failed to call getActiveServiceComponentName", e);
		return null;
		@@ -106,7 +114,9 @@ public class AssistUtils {

		public void hideCurrentSession() {
		try {
		if (mVoiceInteractionManagerService != null) {
		mVoiceInteractionManagerService.hideCurrentSession();
		}
		} catch (RemoteException e) {
		Log.w(TAG, "Failed to call hideCurrentSession", e);
		}