Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev

Browse Source
This commit is contained in:
Tony Mak
2016-04-19 15:15:20 +00:00
committed by Android (Google) Code Review
parent 28e284bd06 92c989dc4c
commit 95a127cbf4
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.IPackageManager; import android.content.pm.IPackageManager;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.ContentObserver; import android.database.ContentObserver;
@@ -3950,9 +3951,17 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
private void updatePublicMode() { private void updatePublicMode() {
setLockscreenPublicMode( boolean isPublic = false;
mStatusBarKeyguardViewManager.isShowing() && mStatusBarKeyguardViewManager if (mStatusBarKeyguardViewManager.isShowing()) {
.isSecure(mCurrentUserId)); 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) { protected void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {