Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev (3d06ea03) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1509,9 +1509,13 @@ public final class ActivityStackSupervisor implements DisplayListener {
		intent.addCategory(Intent.CATEGORY_VOICE);
		if (!AppGlobals.getPackageManager().activitySupportsIntent(
		intent.getComponent(), intent, resolvedType)) {
		Slog.w(TAG,
		"Activity being started in current voice task does not support voice: "
		+ intent);
		err = ActivityManager.START_NOT_VOICE_COMPATIBLE;
		}
		} catch (RemoteException e) {
		Slog.w(TAG, "Failure checking voice capabilities", e);
		err = ActivityManager.START_NOT_VOICE_COMPATIBLE;
		}
		}
		@@ -1523,9 +1527,13 @@ public final class ActivityStackSupervisor implements DisplayListener {
		try {
		if (!AppGlobals.getPackageManager().activitySupportsIntent(intent.getComponent(),
		intent, resolvedType)) {
		Slog.w(TAG,
		"Activity being started in new voice task does not support: "
		+ intent);
		err = ActivityManager.START_NOT_VOICE_COMPATIBLE;
		}
		} catch (RemoteException e) {
		Slog.w(TAG, "Failure checking voice capabilities", e);
		err = ActivityManager.START_NOT_VOICE_COMPATIBLE;
		}
		}