diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-07 18:06:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-07 18:06:01 +0000 |
| commit | 3d06ea0349d6afb4248ab47151424bf64cdf5a2d (patch) | |
| tree | 1aa3ccde4b7af4ab9db75c7a5a8203b763ed0b2e | |
| parent | 53d6cddb4137c7b5648fc069adcc0cf6c501a6c4 (diff) | |
| parent | 74aefdf28f4accbaa5d8f0978008472fe562196a (diff) | |
| download | frameworks_base-3d06ea0349d6afb4248ab47151424bf64cdf5a2d.zip frameworks_base-3d06ea0349d6afb4248ab47151424bf64cdf5a2d.tar.gz frameworks_base-3d06ea0349d6afb4248ab47151424bf64cdf5a2d.tar.bz2 | |
Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 71fd49b..7c79661 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -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; } } |