am 03872c07: Fixed a bug with svelte and voice assist (4d2127fc) · Commits · e / os / android_frameworks_base

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}