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

Commit d4d7877b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 78f14285: am 70419f5a: am 5096ee81: am 0fe3e455: am 3d06ea03: Merge... 

am 78f14285: am 70419f5a: am 5096ee81: am 0fe3e455: am 3d06ea03: Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev

* commit '78f14285':
  Debugging for issue #22556778: Starting under voice control not allowed
parents f9ec671d 78f14285

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

+8 −0
Original line number Diff line number Diff line
@@ -1518,9 +1518,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;

                }

            }
@@ -1532,9 +1536,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;

            }

        }