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

Commit be1ec792 authored by Matías Hernández's avatar Matías Hernández Committed by Automerger Merge Worker
Browse files

Merge "Allow tests to verify the result of... 

Merge "Allow tests to verify the result of PrimarySwitchPreference.setSwitchEnabled()" into udc-dev am: abe2b54b am: a85e1eec

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



Change-Id: I30bc3fdb923f8b2828bdb26eb9c6d28eb9d5d0bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents afdc27d7 a85e1eec

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

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.widget.Switch; 


import androidx.annotation.Keep;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.preference.PreferenceViewHolder;



import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -132,6 +133,11 @@ public class PrimarySwitchPreference extends RestrictedPreference { 
        }

    }



    @VisibleForTesting(otherwise = VisibleForTesting.NONE)

    public boolean isSwitchEnabled() {

        return mEnableSwitch;

    }



    /**

     * If admin is not null, disables the switch.

     * Otherwise, keep it enabled.