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

Commit b6e6e6b3 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

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



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

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.