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

Commit 6b6c5a20 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Make Notification Redaction independent for work profiles 

Bug: 26709332
Change-Id: Ifc13c3c5a62110a3dfc44c2a02df9db11d92b431
parent 4cc9ef8c

core/java/android/provider/Settings.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -5981,7 +5981,6 @@ public final class Settings { 
            CLONE_TO_MANAGED_PROFILE.add(LOCATION_MODE);

            CLONE_TO_MANAGED_PROFILE.add(LOCATION_MODE);

            CLONE_TO_MANAGED_PROFILE.add(LOCATION_PREVIOUS_MODE);

            CLONE_TO_MANAGED_PROFILE.add(LOCATION_PREVIOUS_MODE);

            CLONE_TO_MANAGED_PROFILE.add(LOCATION_PROVIDERS_ALLOWED);

            CLONE_TO_MANAGED_PROFILE.add(LOCATION_PROVIDERS_ALLOWED);

            CLONE_TO_MANAGED_PROFILE.add(LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS);

            CLONE_TO_MANAGED_PROFILE.add(SELECTED_INPUT_METHOD_SUBTYPE);

            CLONE_TO_MANAGED_PROFILE.add(SELECTED_INPUT_METHOD_SUBTYPE);

            CLONE_TO_MANAGED_PROFILE.add(SELECTED_SPELL_CHECKER);

            CLONE_TO_MANAGED_PROFILE.add(SELECTED_SPELL_CHECKER);

            CLONE_TO_MANAGED_PROFILE.add(SELECTED_SPELL_CHECKER_SUBTYPE);

            CLONE_TO_MANAGED_PROFILE.add(SELECTED_SPELL_CHECKER_SUBTYPE);

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ public class RestrictedLockUtils { 
     * {@link UserHandle#USER_NULL}.

     * {@link UserHandle#USER_NULL}.

     */

     */

    public static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context,

    public static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context,

            int keyguardFeatures) {

            int keyguardFeatures, int userId) {

        final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(

        final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(

                Context.DEVICE_POLICY_SERVICE);

                Context.DEVICE_POLICY_SERVICE);

        if (dpm == null) {

        if (dpm == null) {
@@ -135,7 +135,6 @@ public class RestrictedLockUtils { 
        final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);

        final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);

        LockPatternUtils lockPatternUtils = new LockPatternUtils(context);

        LockPatternUtils lockPatternUtils = new LockPatternUtils(context);

        EnforcedAdmin enforcedAdmin = null;

        EnforcedAdmin enforcedAdmin = null;

        final int userId = UserHandle.myUserId();

        if (um.getUserInfo(userId).isManagedProfile()) {

        if (um.getUserInfo(userId).isManagedProfile()) {

            final List<ComponentName> admins = dpm.getActiveAdminsAsUser(userId);

            final List<ComponentName> admins = dpm.getActiveAdminsAsUser(userId);

            if (admins == null) {

            if (admins == null) {