diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-02-03 21:24:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-03 21:24:51 +0000 |
| commit | 6317e06635ed52a9d1c1aeb0439017418f57ad0f (patch) | |
| tree | 3ddccf3e5908e9e15dbccb30cf7efb2ab6857c5c | |
| parent | fa893886418a077c94ac7280a756b207fc821583 (diff) | |
| parent | dc333212bdab6d9da7f3dc7bd813350d06179c5c (diff) | |
| download | packages_apps_Settings-6317e06635ed52a9d1c1aeb0439017418f57ad0f.zip packages_apps_Settings-6317e06635ed52a9d1c1aeb0439017418f57ad0f.tar.gz packages_apps_Settings-6317e06635ed52a9d1c1aeb0439017418f57ad0f.tar.bz2 | |
Merge "set tapjacking protection for deviceadmin permission dialog"
| -rw-r--r-- | src/com/android/settings/DeviceAdminAdd.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java index ed95500..c9f876b 100644 --- a/src/com/android/settings/DeviceAdminAdd.java +++ b/src/com/android/settings/DeviceAdminAdd.java @@ -259,6 +259,7 @@ public class DeviceAdminAdd extends Activity { mAdminWarning = (TextView) findViewById(R.id.admin_warning); mAdminPolicies = (ViewGroup) findViewById(R.id.admin_policies); mCancelButton = (Button) findViewById(R.id.cancel_button); + mCancelButton.setFilterTouchesWhenObscured(true); mCancelButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { EventLog.writeEvent(EventLogTags.EXP_DET_DEVICE_ADMIN_DECLINED_BY_USER, @@ -267,6 +268,7 @@ public class DeviceAdminAdd extends Activity { } }); mActionButton = (Button) findViewById(R.id.action_button); + mActionButton.setFilterTouchesWhenObscured(true); mActionButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { if (mAdding) { |