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

Merge "Fix issue #24743380: VoiceInteractionManagerService doesn't use current..." into mnc-dr-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-10-10 00:42:02 +00:00
committed by Android (Google) Code Review
parent 1078942ed8 958b9d2ecc
commit 09e405d660
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
View File

@@ -925,7 +925,7 @@ public class VoiceInteractionManagerService extends SystemService {
return; return;
} }
synchronized (this) { synchronized (this) {
pw.println("VOICE INTERACTION MANAGER (dumpsys voiceinteraction)\n"); pw.println("VOICE INTERACTION MANAGER (dumpsys voiceinteraction)");
pw.println(" mEnableService: " + mEnableService); pw.println(" mEnableService: " + mEnableService);
if (mImpl == null) { if (mImpl == null) {
pw.println(" (No active implementation)"); pw.println(" (No active implementation)");

16
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
View File

@@ -36,6 +36,7 @@ import android.service.voice.IVoiceInteractionService;
import android.service.voice.IVoiceInteractionSession; import android.service.voice.IVoiceInteractionSession;
import android.service.voice.VoiceInteractionService; import android.service.voice.VoiceInteractionService;
import android.service.voice.VoiceInteractionServiceInfo; import android.service.voice.VoiceInteractionServiceInfo;
import android.util.PrintWriterPrinter;
import android.util.Slog; import android.util.Slog;
import android.view.IWindowManager; import android.view.IWindowManager;
@@ -114,9 +115,9 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne
mAm = ActivityManagerNative.getDefault(); mAm = ActivityManagerNative.getDefault();
VoiceInteractionServiceInfo info; VoiceInteractionServiceInfo info;
try { try {
info = new VoiceInteractionServiceInfo(context.getPackageManager(), service); info = new VoiceInteractionServiceInfo(context.getPackageManager(), service, mUser);
} catch (PackageManager.NameNotFoundException e) { } catch (RemoteException|PackageManager.NameNotFoundException e) {
Slog.w(TAG, "Voice interaction service not found: " + service); Slog.w(TAG, "Voice interaction service not found: " + service, e);
mInfo = null; mInfo = null;
mSessionComponentName = null; mSessionComponentName = null;
mIWindowManager = null; mIWindowManager = null;
@@ -260,9 +261,18 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne
} }
return; return;
} }
pw.print(" mUser="); pw.println(mUser);
pw.print(" mComponent="); pw.println(mComponent.flattenToShortString()); pw.print(" mComponent="); pw.println(mComponent.flattenToShortString());
pw.print(" Session service="); pw.println(mInfo.getSessionService()); pw.print(" Session service="); pw.println(mInfo.getSessionService());
pw.println(" Service info:");
mInfo.getServiceInfo().dump(new PrintWriterPrinter(pw), " ");
pw.println(" Application info:");
mInfo.getServiceInfo().applicationInfo.dump(new PrintWriterPrinter(pw), " ");
pw.print(" Recognition service="); pw.println(mInfo.getRecognitionService());
pw.print(" Settings activity="); pw.println(mInfo.getSettingsActivity()); pw.print(" Settings activity="); pw.println(mInfo.getSettingsActivity());
pw.print(" Supports assist="); pw.println(mInfo.getSupportsAssist());
pw.print(" Supports launch from keyguard=");
pw.println(mInfo.getSupportsLaunchFromKeyguard());
if (mDisabledShowContext != 0) { if (mDisabledShowContext != 0) {
pw.print(" mDisabledShowContext="); pw.print(" mDisabledShowContext=");
pw.println(Integer.toHexString(mDisabledShowContext)); pw.println(Integer.toHexString(mDisabledShowContext));