Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '70419f5ab53889d7a4636e3fd62b7c3a7f9e8b54':
  Debugging for issue #22556778: Starting under voice control not allowed
This commit is contained in:
Dianne Hackborn
2015-08-07 18:50:07 +00:00
committed by Android Git Automerger
parent c42545fbd7 70419f5ab5
commit 78f1428565
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

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