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

am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev

Browse Source 
* commit 'e58ba842de4324c62b7e527f0b90fc6ee5ccba13':
  Fix SysUI crashes on svelte devices
This commit is contained in:
Jorim Jaggi
2015-07-20 23:40:00 +00:00
committed by Android Git Automerger
parent 6ae0a992c8 e58ba842de
commit 027db7c90a
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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