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

Commit b0d3ab2c authored by Kenny Guy's avatar Kenny Guy
Browse files

Fix issue with ignoring dpm policy for first call. 

Fix the fact that the first call to
userAllowsPrivateNotificationsInPublic ignores flags
set by the dpm.

Change-Id: Ib6f33edc00f822eb45d13ba2366ddb2c68179e73
parent 92b2fe5d

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+3 −2
Original line number Diff line number Diff line
@@ -1181,14 +1181,15 @@ public abstract class BaseStatusBar extends SystemUI implements 
        }



        if (mUsersAllowingPrivateNotifications.indexOfKey(userHandle) < 0) {

            final boolean allowed = 0 != Settings.Secure.getIntForUser(

            final boolean allowedByUser = 0 != Settings.Secure.getIntForUser(

                    mContext.getContentResolver(),

                    Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0, userHandle);

            final int dpmFlags = mDevicePolicyManager.getKeyguardDisabledFeatures(null /* admin */,

                    userHandle);

            final boolean allowedByDpm = (dpmFlags

                    & DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS) == 0;

            mUsersAllowingPrivateNotifications.append(userHandle, allowed && allowedByDpm);

            final boolean allowed = allowedByUser && allowedByDpm;

            mUsersAllowingPrivateNotifications.append(userHandle, allowed);

            return allowed;

        }