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

Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into rvc-dev

Browse Source
This commit is contained in:
Linus Tufvesson
2022-08-10 07:58:52 +00:00
committed by Android (Google) Code Review
parent d69df94c24 778191bdf2
commit 69e4884a10
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -564,8 +564,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
/**
* Returns {@code true} if the callingUid has any non-toast window currently visible to the
* user. Also ignores {@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_STARTING},
* since those windows don't belong to apps.
* @see WindowState#isNonToastOrStarting()
* and{@link android.view.WindowManager.LayoutParams#TYPE_PRIVATE_PRESENTATION}, as they
* should not count towards the apps visibility
* @see WindowState#isNonToastOrStartingOrPrivatePresentation()
*/
boolean isAnyNonToastWindowVisibleForUid(int callingUid) {
final PooledPredicate p = PooledLambda.obtainPredicate(

18
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -5825,20 +5825,24 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}
/**
* Returns {@code true} if this window is not {@link WindowManager.LayoutParams#TYPE_TOAST}
* or {@link WindowManager.LayoutParams#TYPE_APPLICATION_STARTING},
* since this window doesn't belong to apps.
* Returns {@code true} if this window is not {@link WindowManager.LayoutParams#TYPE_TOAST},
* {@link WindowManager.LayoutParams#TYPE_APPLICATION_STARTING} or
* {@link WindowManager.LayoutParams#TYPE_PRIVATE_PRESENTATION},
* since those windows should not count towards the apps visibility.
*/
boolean isNonToastOrStarting() {
return mAttrs.type != TYPE_TOAST && mAttrs.type != TYPE_APPLICATION_STARTING;
boolean isNonToastOrStartingOrPrivatePresentation() {
return mAttrs.type != TYPE_TOAST && mAttrs.type != TYPE_APPLICATION_STARTING
&& mAttrs.type != TYPE_PRIVATE_PRESENTATION;
}
boolean isNonToastWindowVisibleForUid(int callingUid) {
return getOwningUid() == callingUid && isNonToastOrStarting() && isVisibleNow();
return getOwningUid() == callingUid && isNonToastOrStartingOrPrivatePresentation()
&& isVisibleNow();
}
boolean isNonToastWindowVisibleForPid(int pid) {
return mSession.mPid == pid && isNonToastOrStarting() && isVisibleNow();
return mSession.mPid == pid && isNonToastOrStartingOrPrivatePresentation()
&& isVisibleNow();
}
void setViewVisibility(int viewVisibility) {