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

Commit 93a9e9f7 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Disabling the activate button when paused am: 9ffee0d5 

am: d27e28ea

Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
parents c84dc8fe d27e28ea

src/com/android/settings/DeviceAdminAdd.java

+5 −16
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings;



import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.app.AppOpsManager;



import org.xmlpull.v1.XmlPullParserException;
@@ -71,7 +73,6 @@ public class DeviceAdminAdd extends Activity { 
    Handler mHandler;



    DevicePolicyManager mDPM;

    AppOpsManager mAppOps;

    DeviceAdminInfo mDeviceAdmin;

    CharSequence mAddMsgText;

    String mProfileOwnerName;
@@ -95,17 +96,15 @@ public class DeviceAdminAdd extends Activity { 
    boolean mRefreshing;

    boolean mWaitingForRemoveMsg;

    boolean mAddingProfileOwner;

    int mCurSysAppOpMode;

    int mCurToastAppOpMode;



    @Override

    protected void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        mHandler = new Handler(getMainLooper());



        mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);

        mAppOps = (AppOpsManager)getSystemService(Context.APP_OPS_SERVICE);

        PackageManager packageManager = getPackageManager();



        if ((getIntent().getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0) {
@@ -355,24 +354,14 @@ public class DeviceAdminAdd extends Activity { 
    @Override

    protected void onResume() {

        super.onResume();

        mActionButton.setEnabled(true);

        updateInterface();

        // As long as we are running, don't let this admin overlay stuff on top of the screen.

        final int uid = mDeviceAdmin.getActivityInfo().applicationInfo.uid;

        final String pkg = mDeviceAdmin.getActivityInfo().applicationInfo.packageName;

        mCurSysAppOpMode = mAppOps.checkOp(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg);

        mCurToastAppOpMode = mAppOps.checkOp(AppOpsManager.OP_TOAST_WINDOW, uid, pkg);

        mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, AppOpsManager.MODE_IGNORED);

        mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, AppOpsManager.MODE_IGNORED);

    }



    @Override

    protected void onPause() {

        super.onPause();

        // As long as we are running, don't let this admin overlay stuff on top of the screen.

        final int uid = mDeviceAdmin.getActivityInfo().applicationInfo.uid;

        final String pkg = mDeviceAdmin.getActivityInfo().applicationInfo.packageName;

        mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, mCurSysAppOpMode);

        mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, mCurToastAppOpMode);

        mActionButton.setEnabled(false);

        try {

            ActivityManagerNative.getDefault().resumeAppSwitches();

        } catch (RemoteException e) {