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

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

Merge tag 'android-security-12.1.0_r4' into staging/lineage-19.1_android-security-12.1.0_r4 

Android Security 12.1.0 Release 4 (12496785)

* tag 'android-security-12.1.0_r4':
  Prevent clickjacking attack in DocsUi.

Change-Id: If69bfa170172393bdbb126155b30c75603c31e53
parents 0d050d3a 14f1f08b

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