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

Commit 14f1f08b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29185163']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29185163'] into security-aosp-sc-v2-release.

Change-Id: I874d5b888bfeec8e973492c52dcd635563fbadcc
parents 2c8b4dc9 f6adbfe9

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

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

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

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



    <!-- Permissions required for reading and logging compat changes -->

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

src/com/android/documentsui/BaseActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ public abstract class BaseActivity 
        // Record the time when onCreate is invoked for metric.

        mStartTime = new Date().getTime();



        if (Build.VERSION.SDK_INT >= 31) {

            getWindow().setHideOverlayWindows(true);

        }



        // ToDo Create tool to check resource version before applyStyle for the theme

        // If version code is not match, we should reset overlay package to default,

        // in case Activity continueusly encounter resource not found exception

src/com/android/documentsui/picker/ConfirmFragment.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.documentsui.base.Shared.getCallingAppName; 
import android.app.Dialog;

import android.content.DialogInterface;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;



import androidx.fragment.app.DialogFragment;
@@ -102,7 +103,11 @@ public class ConfirmFragment extends DialogFragment { 
        builder.setNegativeButton(android.R.string.cancel,

                (DialogInterface dialog, int id) -> pickResult.increaseActionCount());



        return builder.create();

        Dialog dialog = builder.create();

        if (Build.VERSION.SDK_INT >= 31) {

            dialog.getWindow().setHideOverlayWindows(true);

        }

        return dialog;

    }



    @Override