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

Commit 808cbae4 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "Set lock screen to be in public mode if one of its profile is secure"... 

Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev am: 95a127cb
am: 0b6d308b

* commit '0b6d308b':
  Set lock screen to be in public mode if one of its profile is secure

Change-Id: Iba17b0ade4e0ad775a430ac6d0de2c55ea4d4acc
parents 471c2f9f 0b6d308b

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+12 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.database.ContentObserver;
@@ -3950,9 +3951,17 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }



    private void updatePublicMode() {

        setLockscreenPublicMode(

                mStatusBarKeyguardViewManager.isShowing() && mStatusBarKeyguardViewManager

                        .isSecure(mCurrentUserId));

        boolean isPublic = false;

        if (mStatusBarKeyguardViewManager.isShowing()) {

            for (int i = mCurrentProfiles.size() - 1; i >= 0; i--) {

                UserInfo userInfo = mCurrentProfiles.valueAt(i);

                if (mStatusBarKeyguardViewManager.isSecure(userInfo.id)) {

                    isPublic = true;

                    break;

                }

            }

        }

        setLockscreenPublicMode(isPublic);

    }



    protected void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {