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

Merge "Fix SysUI crashes on svelte devices" into mnc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2015-07-20 23:09:44 +00:00
committed by Android (Google) Code Review
parent 41668b259d e446dcee8f
commit 8924f23d3e
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/com/android/internal/app/AssistUtils.java
View File

@@ -49,8 +49,10 @@ public class AssistUtils {
public boolean showSessionForActiveService(Bundle args, int sourceFlags,
IVoiceInteractionSessionShowCallback showCallback, IBinder activityToken) {
try {
return mVoiceInteractionManagerService.showSessionForActiveService(args, sourceFlags,
showCallback, activityToken);
if (mVoiceInteractionManagerService != null) {
return mVoiceInteractionManagerService.showSessionForActiveService(args,
sourceFlags, showCallback, activityToken);
}
} catch (RemoteException e) {
Log.w(TAG, "Failed to call showSessionForActiveService", e);
}
@@ -59,7 +61,9 @@ public class AssistUtils {
public void launchVoiceAssistFromKeyguard() {
try {
mVoiceInteractionManagerService.launchVoiceAssistFromKeyguard();
if (mVoiceInteractionManagerService != null) {
mVoiceInteractionManagerService.launchVoiceAssistFromKeyguard();
}
} catch (RemoteException e) {
Log.w(TAG, "Failed to call launchVoiceAssistFromKeyguard", e);
}
@@ -87,7 +91,11 @@ public class AssistUtils {
public ComponentName getActiveServiceComponentName() {
try {
return mVoiceInteractionManagerService.getActiveServiceComponentName();
if (mVoiceInteractionManagerService != null) {
return mVoiceInteractionManagerService.getActiveServiceComponentName();
} else {
return null;
}
} catch (RemoteException e) {
Log.w(TAG, "Failed to call getActiveServiceComponentName", e);
return null;
@@ -106,7 +114,9 @@ public class AssistUtils {
public void hideCurrentSession() {
try {
mVoiceInteractionManagerService.hideCurrentSession();
if (mVoiceInteractionManagerService != null) {
mVoiceInteractionManagerService.hideCurrentSession();
}
} catch (RemoteException e) {
Log.w(TAG, "Failed to call hideCurrentSession", e);
}