From 06fb230d6dd2a05b696d04a171d38ed6e9127dc7 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 11 Mar 2022 08:17:05 +0000 Subject: [PATCH] Allow IVoiceInteractionSessionListener to listen for window vis changes - The listener currently tracks session shown/hidden, but doesn't track the visibility of the session window which can change on the client side without the server knowing. In some cases, it's useful for SysUI to be able to track the visibility of the session window to show/hide bars appropriately. Bug: 222308557 Test: Manual, launch the assistant and verify the calls are made Change-Id: I9b4bb27c9497b2a828616caf72eaf345b072c294 --- .../voice/VoiceInteractionSession.java | 20 ++++++++++++-- .../app/IVoiceInteractionManagerService.aidl | 5 ++++ .../app/IVoiceInteractionSessionListener.aidl | 5 ++++ .../systemui/assist/AssistManager.java | 8 ++++++ .../VoiceInteractionManagerService.java | 26 +++++++++++++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java index 4bbfbc2e717d8..b783f6b8fd51b 100644 --- a/core/java/android/service/voice/VoiceInteractionSession.java +++ b/core/java/android/service/voice/VoiceInteractionSession.java @@ -1095,7 +1095,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall if (!mWindowVisible) { mWindowVisible = true; if (mUiEnabled) { - mWindow.show(); + showWindow(); } } if (showCallback != null) { @@ -1284,9 +1284,25 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall } } + void showWindow() { + if (mWindow != null) { + mWindow.show(); + try { + mSystemService.setSessionWindowVisible(mToken, true); + } catch (RemoteException e) { + Log.w(TAG, "Failed to notify session window shown", e); + } + } + } + void ensureWindowHidden() { if (mWindow != null) { mWindow.hide(); + try { + mSystemService.setSessionWindowVisible(mToken, false); + } catch (RemoteException e) { + Log.w(TAG, "Failed to notify session window hidden", e); + } } } @@ -1377,7 +1393,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall if (mWindowVisible) { if (enabled) { ensureWindowAdded(); - mWindow.show(); + showWindow(); } else { ensureWindowHidden(); } diff --git a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl index 52d54cd1f7176..681693b1dbade 100644 --- a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl @@ -284,4 +284,9 @@ interface IVoiceInteractionManagerService { * Stops to listen the status of visible activity. */ void stopListeningVisibleActivityChanged(in IBinder token); + + /** + * Notifies when the session window is shown or hidden. + */ + void setSessionWindowVisible(in IBinder token, boolean visible); } diff --git a/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl b/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl index bc757e24c852c..6e409885fa136 100644 --- a/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl @@ -29,6 +29,11 @@ */ void onVoiceSessionHidden(); + /** + * Called when a voice session window is shown/hidden. + */ + void onVoiceSessionWindowVisibilityChanged(boolean visible); + /** * Called when UI hints were received. */ diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 9d5b93c2b329b..7c2673c31bf5d 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -186,6 +186,14 @@ public class AssistManager { AssistantSessionEvent.ASSISTANT_SESSION_CLOSE); } + @Override + public void onVoiceSessionWindowVisibilityChanged(boolean visible) + throws RemoteException { + if (VERBOSE) { + Log.v(TAG, "Window visibility changed: " + visible); + } + } + @Override public void onSetUiHints(Bundle hints) { if (VERBOSE) { diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 8cbbe947d32d7..f31cdcba58300 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -1824,6 +1824,32 @@ public class VoiceInteractionManagerService extends SystemService { } } + public void setSessionWindowVisible(IBinder token, boolean visible) { + synchronized (this) { + if (mImpl == null) { + Slog.w(TAG, "setSessionWindowVisible called without running voice interaction " + + "service"); + return; + } + if (mImpl.mActiveSession == null || token != mImpl.mActiveSession.mToken) { + Slog.w(TAG, "setSessionWindowVisible does not match active session"); + return; + } + final long caller = Binder.clearCallingIdentity(); + try { + mVoiceInteractionSessionListeners.broadcast(listener -> { + try { + listener.onVoiceSessionWindowVisibilityChanged(visible); + } catch (RemoteException e) { + Slog.e(TAG, "Error delivering window visibility event to listener.", e); + } + }); + } finally { + Binder.restoreCallingIdentity(caller); + } + } + } + @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;