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

Merge "Refactor notifyScreenshotListeners method in WMS" into udc-dev

Browse Source
This commit is contained in:
Omar Eissa
2023-03-20 09:35:02 +00:00
committed by Android (Google) Code Review
parent d374dc633f d449468a34
commit f35768e335
1 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -9383,30 +9383,6 @@ public class WindowManagerService extends IWindowManager.Stub
mSurfaceSyncGroupController.markSyncGroupReady(syncGroupToken);
}
private ArraySet<ActivityRecord> getVisibleActivityRecords(int displayId) {
ArraySet<ActivityRecord> result = new ArraySet<>();
synchronized (mGlobalLock) {
ArraySet<ComponentName> addedActivities = new ArraySet<>();
DisplayContent displayContent = mRoot.getDisplayContent(displayId);
if (displayContent != null) {
displayContent.forAllWindows(
(w) -> {
if (w.isVisible()
&& w.isDisplayed()
&& w.mActivityRecord != null
&& !addedActivities.contains(
w.mActivityRecord.mActivityComponent)
&& w.mActivityRecord.isVisible()
&& w.isVisibleNow()) {
addedActivities.add(w.mActivityRecord.mActivityComponent);
result.add(w.mActivityRecord);
}
},
true /* traverseTopToBottom */);
}
}
return result;
}
/**
* Must be called when a screenshot is taken via hardware chord.
@@ -9422,14 +9398,20 @@ public class WindowManagerService extends IWindowManager.Stub
throw new SecurityException("Requires STATUS_BAR_SERVICE permission");
}
synchronized (mGlobalLock) {
ArraySet<ComponentName> notifiedApps = new ArraySet<>();
ArraySet<ActivityRecord> visibleApps = getVisibleActivityRecords(displayId);
for (ActivityRecord ar : visibleApps) {
if (ar.isRegisteredForScreenCaptureCallback()) {
ar.reportScreenCaptured();
notifiedApps.add(ar.mActivityComponent);
}
final DisplayContent displayContent = mRoot.getDisplayContent(displayId);
if (displayContent == null) {
return new ArrayList<>();
}
ArraySet<ComponentName> notifiedApps = new ArraySet<>();
displayContent.forAllActivities(
(ar) -> {
if (!notifiedApps.contains(ar.mActivityComponent) && ar.isVisible()
&& ar.isRegisteredForScreenCaptureCallback()) {
ar.reportScreenCaptured();
notifiedApps.add(ar.mActivityComponent);
}
},
true /* traverseTopToBottom */);
return List.copyOf(notifiedApps);
}
}