summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2016-07-18 13:31:39 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2016-07-18 13:31:42 -0700
commitb0ce821e7d0f9cffb95575c748201af51ec45faa (patch)
treef9d212ee85fa1764534cac0e5a92a41fb304a772 /res
parent0f8ca3cd2801e43b17c59cdd0e1377b5ef5602a8 (diff)
downloadandroid_packages_apps_PackageInstaller-b0ce821e7d0f9cffb95575c748201af51ec45faa.tar.gz
android_packages_apps_PackageInstaller-b0ce821e7d0f9cffb95575c748201af51ec45faa.tar.bz2
android_packages_apps_PackageInstaller-b0ce821e7d0f9cffb95575c748201af51ec45faa.zip
Remove lefover secure button
An incorrect fix for a security bug where apps with overlay access can redress the permission message added a secure button implementation that refuses interaction if the window is covered. While this was fixed in M branches we did not merge the change in NYC because we now hide all overlays. However, the app op which controls overlays allows privileged apps to bypass the app op. It is fine to have priv apps overlay stuff on top of the permissions UI except that the allow button show be clickable. This change removes the offending code. bug:29879858 Change-Id: I9d0b5e62b5ef029069e37f34dbcd90d4909d966b
Diffstat (limited to 'res')
-rw-r--r--res/layout/grant_permissions.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index 58d33b61..abb219a5 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -102,13 +102,13 @@
android:text="@string/grant_dialog_button_deny" >
</Button>
- <com.android.packageinstaller.permission.ui.SecureButtonView
+ <Button
android:id="@+id/permission_allow_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/buttonBarButtonStyle"
android:text="@string/grant_dialog_button_allow" >
- </com.android.packageinstaller.permission.ui.SecureButtonView>
+ </Button>
</com.android.packageinstaller.permission.ui.ButtonBarLayout>