diff options
| author | Selim Cinek <cinek@google.com> | 2015-05-07 18:12:51 -0700 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2015-05-08 01:21:38 +0000 |
| commit | 03872c075e756b37a80de708cbd8d3d65d50a3a8 (patch) | |
| tree | afae62b128ef98fa29d7406ccf9b8db2e29f1f6e /services | |
| parent | 3199980812473f8008b83e24c87fdeab28a68042 (diff) | |
| download | frameworks_base-03872c075e756b37a80de708cbd8d3d65d50a3a8.zip frameworks_base-03872c075e756b37a80de708cbd8d3d65d50a3a8.tar.gz frameworks_base-03872c075e756b37a80de708cbd8d3d65d50a3a8.tar.bz2 | |
Fixed a bug with svelte and voice assist
Handling the case that no info is around.
Bug: 20925281
Change-Id: Id5a4c4373877909a898c8852891a854eacbc1f6c
Diffstat (limited to 'services')
| -rw-r--r-- | services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 2897c61..fcdb6d6 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -754,7 +754,7 @@ public class VoiceInteractionManagerService extends SystemService { public boolean activeServiceSupportsAssist() { enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE); synchronized (this) { - return mImpl != null && mImpl.mInfo.getSupportsAssist(); + return mImpl != null && mImpl.mInfo != null && mImpl.mInfo.getSupportsAssist(); } } @@ -762,7 +762,8 @@ public class VoiceInteractionManagerService extends SystemService { public boolean activeServiceSupportsLaunchFromKeyguard() throws RemoteException { enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE); synchronized (this) { - return mImpl != null && mImpl.mInfo.getSupportsLaunchFromKeyguard(); + return mImpl != null && mImpl.mInfo != null + && mImpl.mInfo.getSupportsLaunchFromKeyguard(); } } |