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

Commit 51736a52 authored by Evan Severson's avatar Evan Severson Committed by Anis Assi
Browse files

RESTRICT AUTOMERGE 

Don't allow tapjacking permissioncontroller

Use the filterTouchesWhenObscured attribute throughout the permission
controller.

Bug: 155287782
Test: Manual using PoC app from b/154015447#comment1
Change-Id: I205395fdcabe68055df15ce9414468a833a0807c
(cherry picked from commit 36409f23)
parent c3a4cf72

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 
        <activity android:name=".permission.ui.GrantPermissionsActivity"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:excludeFromRecents="true"

                android:theme="@style/GrantPermissions"

                android:theme="@style/GrantPermissions.FilterTouches"

                android:visibleToInstantApps="true">

            <intent-filter android:priority="1">

                <action android:name="android.content.pm.action.REQUEST_PERMISSIONS" />
@@ -138,7 +138,7 @@ 
                  android:configChanges="orientation|keyboardHidden|screenSize"

                  android:excludeFromRecents="true"

                  android:label="@string/app_permissions"

                  android:theme="@style/Settings"

                  android:theme="@style/Settings.FilterTouches"

                  android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.MANAGE_PERMISSIONS" />

res/values/themes.xml

+17 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
        <item name="android:textAppearanceMedium">@style/MediumText</item>

        <item name="android:textAppearanceSmall">@style/SmallText</item>

        <item name="android:titleTextStyle">@style/TitleText</item>

        <item name="android:filterTouchesWhenObscured">true</item>

    </style>



    <style name="DialogWhenLargeNoAnimation" parent="DialogWhenLarge">
@@ -54,4 +55,20 @@ 
    </style>









<!-- Do not allow OEMs to overlay these themes.

 Must Guarantee that filterTouches is set for these activities -->

    <style name="FilterTouches">

        <item name="android:filterTouchesWhenObscured">true</item>

    </style>



    <style name="Settings.FilterTouches">

        <item name="android:filterTouchesWhenObscured">true</item>

    </style>



    <style name="GrantPermissions.FilterTouches">

        <item name="android:filterTouchesWhenObscured">true</item>

    </style>



</resources>