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

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

Merge tag 'android-security-8.1.0_r84' into staging/lineage-15.1_merge_android-security-8.1.0_r84 

Android security 8.1.0 release 84

* tag 'android-security-8.1.0_r84':
  DO NOT MERGE: Hide overlays over uninstall confirm dialog
  RESTRICT AUTOMERGE Don't allow tapjacking permissioncontroller

Change-Id: I61a9572c345525570caa93d36bd10e382bc12bfe
parents 6ee7acf2 210a1c4a

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>

src/com/android/packageinstaller/UninstallerActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
*/

package com.android.packageinstaller;



import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.app.Activity;

import android.app.ActivityThread;

import android.app.DialogFragment;
@@ -78,6 +80,8 @@ public class UninstallerActivity extends Activity { 


    @Override

    public void onCreate(Bundle icicle) {

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        super.onCreate(icicle);

        // Get intent information.

        // We expect an intent with URI of the form package://<packageName>#<className>