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

Commit db11f633 authored by Ricky Wai's avatar Ricky Wai Committed by Automerger Merge Worker
Browse files

Merge "Do not update enabled state when app ops is not changed" into tm-dev... 

Merge "Do not update enabled state when app ops is not changed" into tm-dev am: 8d4ecda1 am: a70da224 am: f4b7d5e2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482694



Change-Id: Ie53c4a469e6b24c9664a515537b498e405765ada
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20ff9f20 f4b7d5e2

packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java

+2 −4
Original line number Diff line number Diff line
@@ -198,9 +198,8 @@ public class RestrictedPreferenceHelper { 
        if (mDisabledByAdmin != disabled) {

            mDisabledByAdmin = disabled;

            changed = true;

        }



            updateDisabledState();

        }



        return changed;

    }
@@ -210,9 +209,8 @@ public class RestrictedPreferenceHelper { 
        if (mDisabledByAppOps != disabled) {

            mDisabledByAppOps = disabled;

            changed = true;

        }



            updateDisabledState();

        }



        return changed;

    }

packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java

+4 −2
Original line number Diff line number Diff line
@@ -254,9 +254,11 @@ public class RestrictedSwitchPreference extends SwitchPreference { 
        final boolean ecmEnabled = getContext().getResources().getBoolean(

                com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);

        final boolean appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED;

        if (appOpsAllowed || isEnabled) {

        if (isEnabled) {

            setEnabled(true);

        } else {

        } else if (appOpsAllowed && isDisabledByAppOps()) {

            setEnabled(true);

        } else if (!appOpsAllowed){

            setDisabledByAppOps(true);

        }

    }