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

Merge "Just get VoiceInteractionManagerService once in Activity.java" into tm-qpr-dev am: 52a7497f34

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20514442

Change-Id: I287636660d19ba0268286eb087e05b37d372246a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-17 04:12:54 +00:00
committed by Automerger Merge Worker
parent 086bba93d7 52a7497f34
commit 88ea7d6b02
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/app/Activity.java
View File

@@ -997,6 +997,8 @@ public class Activity extends ContextThemeWrapper
private ComponentCallbacksController mCallbacksController;
@Nullable private IVoiceInteractionManagerService mVoiceInteractionManagerService;
private final WindowControllerCallback mWindowControllerCallback =
new WindowControllerCallback() {
/**
@@ -1606,18 +1608,17 @@ public class Activity extends ContextThemeWrapper
private void notifyVoiceInteractionManagerServiceActivityEvent(
@VoiceInteractionSession.VoiceInteractionActivityEventType int type) {
final IVoiceInteractionManagerService service =
IVoiceInteractionManagerService.Stub.asInterface(
ServiceManager.getService(Context.VOICE_INTERACTION_MANAGER_SERVICE));
if (service == null) {
Log.w(TAG, "notifyVoiceInteractionManagerServiceActivityEvent: Can not get "
+ "VoiceInteractionManagerService");
return;
if (mVoiceInteractionManagerService == null) {
mVoiceInteractionManagerService = IVoiceInteractionManagerService.Stub.asInterface(
ServiceManager.getService(Context.VOICE_INTERACTION_MANAGER_SERVICE));
if (mVoiceInteractionManagerService == null) {
Log.w(TAG, "notifyVoiceInteractionManagerServiceActivityEvent: Can not get "
+ "VoiceInteractionManagerService");
return;
}
}
try {
service.notifyActivityEventChanged(mToken, type);
mVoiceInteractionManagerService.notifyActivityEventChanged(mToken, type);
} catch (RemoteException e) {
// Empty
}