Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6317e066 authored by Amith Yamasani's avatar Amith Yamasani Committed by Gerrit Code Review
Browse files

Merge "set tapjacking protection for deviceadmin permission dialog"

parents fa893886 dc333212

src/com/android/settings/DeviceAdminAdd.java

+2 −0
Original line number Diff line number Diff line
@@ -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) {