summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2016-03-22 22:17:35 (GMT)
committerThe Android Automerger <android-build@android.com>2016-04-22 02:27:39 (GMT)
commit2068c7997265011ddc5e4dfa3418407881f7f81e (patch)
treeddbcaf717c54b25306d374293b02635979f23f34
parent6986f29bb93a6aaaeaaddcab081d0e0afd7082e8 (diff)
downloadandroid_packages_apps_PackageInstaller-2068c7997265011ddc5e4dfa3418407881f7f81e.zip
android_packages_apps_PackageInstaller-2068c7997265011ddc5e4dfa3418407881f7f81e.tar.gz
android_packages_apps_PackageInstaller-2068c7997265011ddc5e4dfa3418407881f7f81e.tar.bz2
DO NOT MERGE Take advantage of new MotionEvent flag to prevent tapjacking.
Bug: 26677796 Change-Id: I563541f0a42564b854af0f8037c1d4741c79a2ac Fix merge conflict when cp'ing ag/903239 to mnc-mr1-release
-rw-r--r--res/layout/grant_permissions.xml4
-rw-r--r--src/com/android/packageinstaller/permission/ui/SecureButtonView.java56
2 files changed, 59 insertions, 1 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index b356524..ffbd276 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -18,6 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
+
<LinearLayout
android:id="@+id/dialog_container"
android:layout_width="fill_parent"
@@ -81,7 +82,7 @@
style="?android:attr/buttonBarButtonStyle"
android:text="@string/grant_dialog_button_deny" />
- <Button
+ <com.android.packageinstaller.permission.ui.SecureButtonView
android:id="@+id/permission_allow_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -92,4 +93,5 @@
</com.android.internal.widget.ButtonBarLayout>
</LinearLayout>
+
</com.android.packageinstaller.permission.ui.ManualLayoutFrame>
diff --git a/src/com/android/packageinstaller/permission/ui/SecureButtonView.java b/src/com/android/packageinstaller/permission/ui/SecureButtonView.java
new file mode 100644
index 0000000..624744e
--- /dev/null
+++ b/src/com/android/packageinstaller/permission/ui/SecureButtonView.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.packageinstaller.permission.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.Button;
+
+/**
+ * Extension of Button that uses the hidden MotionEvent flag for partially obscured windows to
+ * prevent tapjacking attacks.
+ */
+public class SecureButtonView extends Button {
+
+ public SecureButtonView(Context context) {
+ this(context, null);
+ }
+
+ public SecureButtonView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public SecureButtonView(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public SecureButtonView(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ @Override
+ public boolean onFilterTouchEventForSecurity(MotionEvent event) {
+ if ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0
+ || (event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0) {
+ // Window is obscured, drop this touch.
+ return false;
+ }
+ return true;
+ }
+}