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

Commit 534f4e9e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14129455, 14130265, 14129457, 14130197, 14130199,... 

Merge cherrypicks of [14129455, 14130265, 14129457, 14130197, 14130199, 14130200, 14130201, 14130203, 14129438, 14129439, 14129732, 14129441, 14130241, 14129733, 14129734, 14130308, 14130309, 14130310, 14130312] into security-aosp-qt-release

Change-Id: I121cb0fedaa37fad797442c545389f6d489ae7e9
parents 6b8a7999 c0ed2596

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()