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

Commit 6df0db06 authored by Aditya Singh's avatar Aditya Singh Committed by Automerger Merge Worker
Browse files

Prevent clickjacking attack in DocsUi. am: 0f5f4b53 am: f6817a2d am: 1a5ef9d0 am: b7867f60 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/29174651



Change-Id: I9c5fb58c4e66eda1a4276814ae45fe85259fbe8d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 291fbb4d b7867f60

AndroidManifest.xml

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

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

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

    <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

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import com.android.documentsui.roots.ProvidersCache; 
import com.android.documentsui.sidebar.RootsFragment;

import com.android.documentsui.sorting.SortController;

import com.android.documentsui.sorting.SortModel;

import com.android.modules.utils.build.SdkLevel;



import com.android.documentsui.util.VersionUtils;

import com.google.android.material.appbar.AppBarLayout;
@@ -135,6 +136,10 @@ public abstract class BaseActivity 
        // Record the time when onCreate is invoked for metric.

        mStartTime = new Date().getTime();



        if (SdkLevel.isAtLeastS()) {

            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
@@ -32,6 +32,7 @@ import com.android.documentsui.BaseActivity; 
import com.android.documentsui.R;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.Shared;

import com.android.modules.utils.build.SdkLevel;



import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -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 (SdkLevel.isAtLeastS()) {

            dialog.getWindow().setHideOverlayWindows(true);

        }

        return dialog;

    }



    @Override