summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-06-07 17:37:38 (GMT)
committerJessica Wagantall <jwagantall@cyngn.com>2016-06-07 17:37:38 (GMT)
commitb277701816240ceb13425e38b515b790ffd2f864 (patch)
treebe7055a29b2dc239fde191a8e6d4d95159531851
parent9627774ae259215939e839f5e193a492d58ff7ee (diff)
parent2068c7997265011ddc5e4dfa3418407881f7f81e (diff)
downloadandroid_packages_apps_PackageInstaller-b277701816240ceb13425e38b515b790ffd2f864.zip
android_packages_apps_PackageInstaller-b277701816240ceb13425e38b515b790ffd2f864.tar.gz
android_packages_apps_PackageInstaller-b277701816240ceb13425e38b515b790ffd2f864.tar.bz2
Merge tag 'android-6.0.1_r46' into HEAD
Android 6.0.1 release 46 Change-Id: Ie2b11a3416c1719374f06c8048b29f27ab8414a7
-rw-r--r--res/layout/grant_permissions.xml15
-rw-r--r--src/com/android/packageinstaller/permission/ui/SecureButtonView.java56
2 files changed, 63 insertions, 8 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index 463f0cc..ab71e20 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -91,14 +91,13 @@
android:text="@string/grant_dialog_button_deny" >
</Button>
- <Button
- android:id="@+id/permission_allow_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="?android:attr/buttonBarButtonStyle"
- android:layout_marginStart="8dip"
- android:text="@string/grant_dialog_button_allow" >
- </Button>
+ <com.android.packageinstaller.permission.ui.SecureButtonView
+ android:id="@+id/permission_allow_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/buttonBarButtonStyle"
+ android:layout_marginStart="8dip"
+ android:text="@string/grant_dialog_button_allow" />
</LinearLayout>
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;
+ }
+}