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

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

Merge tag 'android-security-9.0.0_r64' into staging/lineage-16.0_merge_android-security-9.0.0_r64 

Android security 9.0.0 release 64

* tag 'android-security-9.0.0_r64':
  DO NOT MERGE: Hide overlays over uninstall confirm dialog
  RESTRICT AUTOMERGE Don't allow tapjacking permissioncontroller
  [RESTRICT AUTOMERGE]: OP_REQUEST_INSTALL_PACKAGES denied by default
  Ask for PIN when granting permissions in front of lock screen
  RESTRICT AUTOMERGE: Trust session id only if started with ACTION_CONFIRM_INSTALL

Change-Id: I248b88066e8c6d4cdfb32251f5a2c13c7069ecee
parents bac41b21 5bca01a1

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,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" />
@@ -145,7 +145,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
@@ -42,6 +42,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">
@@ -58,4 +59,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

+3 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.packageinstaller;



import static android.app.AppOpsManager.MODE_ALLOWED;



import static com.android.packageinstaller.PackageUtil.getMaxTargetSdkVersionForUid;

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



import android.Manifest;

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


    @Override

    public void onCreate(Bundle icicle) {

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        // Never restore any state, esp. never create any fragments. The data in the fragment might

        // be stale, if e.g. the app was uninstalled while the activity was destroyed.

        super.onCreate(null);