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

Unverified Commit 645d7b36 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-10.0.0_r55' into staging/lineage-17.1_merge_android-security-10.0.0_r55 

Android Security 10.0.0 Release 55 (7269719)

* tag 'android-security-10.0.0_r55':
  Hide non-system overlay window on ActivityPicker
  [Security Report] Fix Settings WifiScanModeActivity Overlaid issue

Change-Id: I99df0d328e6510d1a3d0a84963419734368c9355
parents 741695b4 534f4e9e

src/com/android/settings/ActivityPicker.java

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


package com.android.settings;



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



import android.app.Activity;

import android.content.Context;

import android.content.DialogInterface;
@@ -72,6 +74,8 @@ public class ActivityPicker extends AlertActivity implements 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        

        final Intent intent = getIntent();

        

        // Read base intent from extras, otherwise assume default

src/com/android/settings/wifi/WifiScanModeActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.net.wifi.WifiManager; 
import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;

import android.view.WindowManager;



import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.DialogFragment;
@@ -44,6 +45,8 @@ public class WifiScanModeActivity extends FragmentActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        getWindow().addSystemFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        Intent intent = getIntent();

        if (savedInstanceState == null) {

            if (intent != null && intent.getAction()