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

Merge "Don't send callback with null topActivity" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-24 21:13:07 +00:00
committed by Android (Google) Code Review
parent 172a02ec19 ab63d0671c
commit 78e9029df3
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/companion/virtual/VirtualDeviceManager.java
View File

@@ -469,6 +469,10 @@ public final class VirtualDeviceManager {
/** /**
* Called when the top activity is changed. * Called when the top activity is changed.
* *
* <p>Note: When there are no activities running on the virtual display, the
* {@link #onDisplayEmpty(int)} will be called. If the value topActivity is cached, it
* should be cleared when {@link #onDisplayEmpty(int)} is called.
*
* @param displayId The display ID on which the activity change happened. * @param displayId The display ID on which the activity change happened.
* @param topActivity The component name of the top activity. * @param topActivity The component name of the top activity.
*/ */

5
services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java
View File

@@ -165,7 +165,10 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController
@Override @Override
public void onTopActivityChanged(ComponentName topActivity, int uid) { public void onTopActivityChanged(ComponentName topActivity, int uid) {
if (mActivityListener != null) { // Don't send onTopActivityChanged() callback when topActivity is null because it's defined
// as @NonNull in ActivityListener interface. Sends onDisplayEmpty() callback instead when
// there is no activity running on virtual display.
if (mActivityListener != null && topActivity != null) {
// Post callback on the main thread so it doesn't block activity launching // Post callback on the main thread so it doesn't block activity launching
mHandler.post(() -> mHandler.post(() ->
mActivityListener.onTopActivityChanged(Display.INVALID_DISPLAY, topActivity)); mActivityListener.onTopActivityChanged(Display.INVALID_DISPLAY, topActivity));