Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8af807f8 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Tim Schumacher
Browse files

RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. 

1: Cherry-pick ag/4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow

2: Cherry-pick ag/3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded

3: Add permissions to SystemUI to allow it to hide non-system overlays

Bug: 34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
(cherry picked from commit 40f7b583)
parent f4cc356c

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -138,6 +138,9 @@ 
    <!-- blur surface -->

    <!-- blur surface -->

    <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />

    <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />





    <!-- permission necessary to hide non-system overlay windows from covering up the SystemUI -->

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />



    <application

    <application

        android:name=".SystemUIApplication"

        android:name=".SystemUIApplication"

        android:persistent="true"

        android:persistent="true"

packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.systemui.media;

package com.android.systemui.media;





import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.app.Activity;

import android.app.Activity;

import android.app.AlertDialog;

import android.app.AlertDialog;

import android.content.DialogInterface;

import android.content.DialogInterface;
@@ -38,6 +40,7 @@ import android.text.TextUtils; 
import android.text.style.StyleSpan;

import android.text.style.StyleSpan;

import android.util.Log;

import android.util.Log;

import android.util.TypedValue;

import android.util.TypedValue;

import android.view.Window;

import android.view.WindowManager;

import android.view.WindowManager;

import android.widget.CheckBox;

import android.widget.CheckBox;

import android.widget.CompoundButton;

import android.widget.CompoundButton;
@@ -147,7 +150,9 @@ public class MediaProjectionPermissionActivity extends Activity 
        mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);

        mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);





        ((CheckBox) mDialog.findViewById(R.id.remember)).setOnCheckedChangeListener(this);

        ((CheckBox) mDialog.findViewById(R.id.remember)).setOnCheckedChangeListener(this);

        mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

        final Window w = mDialog.getWindow();

        w.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

        w.addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);





        mDialog.show();

        mDialog.show();

    }

    }

services/core/java/com/android/server/wm/WindowManagerService.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -168,6 +168,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; 
import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_COMPATIBLE_WINDOW;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_COMPATIBLE_WINDOW;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
@@ -3209,6 +3210,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                        | WindowManager.LayoutParams.SYSTEM_UI_VISIBILITY_CHANGED)) != 0) {

                        | WindowManager.LayoutParams.SYSTEM_UI_VISIBILITY_CHANGED)) != 0) {

                    win.mLayoutNeeded = true;

                    win.mLayoutNeeded = true;

                }

                }










                if ((flagChanges & PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS) != 0) {










                    updateNonSystemOverlayWindowsVisibilityIfNeeded(










                            win, win.mWinAnimator.mSurfaceShown);










                }








            }




            }


















            if (DEBUG_LAYOUT) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility




            if (DEBUG_LAYOUT) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility








@@ -12160,7 +12166,8 @@ public class WindowManagerService extends IWindowManager.Stub






    }




    }


















    void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {




    void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {








        if (!win.hideNonSystemOverlayWindowsWhenVisible()) {




        if (!win.hideNonSystemOverlayWindowsWhenVisible()










                && !mHidingNonSystemOverlayWindows.contains(win)) {








            return;




            return;








        }




        }








        final boolean systemAlertWindowsHidden = !mHidingNonSystemOverlayWindows.isEmpty();




        final boolean systemAlertWindowsHidden = !mHidingNonSystemOverlayWindows.isEmpty();