summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-08-02 18:11:40 (GMT)
committerJessica Wagantall <jwagantall@cyngn.com>2016-08-02 18:37:49 (GMT)
commit96f551c4ffbf3760f01621b4373ef284a559fef6 (patch)
treea5cf61c5dcbf5f2a6c1aa8f2b903cebe63c8d96c
parent97c5c800f8f658e7aae78f16abaa40a424f39453 (diff)
parent16c392f4ba6156fef978d6630c952f60a2ade65e (diff)
downloadandroid_packages_apps_PackageInstaller-96f551c4ffbf3760f01621b4373ef284a559fef6.zip
android_packages_apps_PackageInstaller-96f551c4ffbf3760f01621b4373ef284a559fef6.tar.gz
android_packages_apps_PackageInstaller-96f551c4ffbf3760f01621b4373ef284a559fef6.tar.bz2
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ic775ddf31a2f5c391898e83bed469041849f8903
-rw-r--r--res/layout/grant_permissions.xml5
-rw-r--r--src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java3
-rw-r--r--src/com/android/packageinstaller/permission/ui/SecureButtonView.java56
3 files changed, 5 insertions, 59 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index ab71e20..5ad4ccf 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -91,13 +91,14 @@
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:layout_marginStart="8dip"
- android:text="@string/grant_dialog_button_allow" />
+ android:text="@string/grant_dialog_button_allow" >
+ </Button>
</LinearLayout>
diff --git a/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java b/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java
index e4cbff3..7b1d379 100644
--- a/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java
@@ -29,7 +29,8 @@ public class OverlayTouchActivity extends Activity {
@Override
public boolean dispatchTouchEvent(MotionEvent event) {
- mObscuredTouch = (event.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0;
+ mObscuredTouch = (event.getFlags() & (MotionEvent.FLAG_WINDOW_IS_OBSCURED
+ | MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED)) != 0;
return super.dispatchTouchEvent(event);
}
diff --git a/src/com/android/packageinstaller/permission/ui/SecureButtonView.java b/src/com/android/packageinstaller/permission/ui/SecureButtonView.java
deleted file mode 100644
index 624744e..0000000
--- a/src/com/android/packageinstaller/permission/ui/SecureButtonView.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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;
- }
-}