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

Merge "Fix broken statusbar disable flags" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-16 00:53:20 +00:00
committed by Android (Google) Code Review
parent 25c66ac8e6 2a62910691
commit c99f05e1b0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -7465,9 +7465,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mKeyguardDelegate != null) {
mKeyguardDelegate.setCurrentUser(newUserId);
}
if (mStatusBarService != null) {
IStatusBarService statusBar = getStatusBarService();
if (statusBar != null) {
try {
mStatusBarService.setCurrentUser(newUserId);
statusBar.setCurrentUser(newUserId);
} catch (RemoteException e) {
// oh well
}

3
services/core/java/com/android/server/statusbar/StatusBarManagerService.java
View File

@@ -68,7 +68,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub {
private int mDisabled1 = 0;
private int mDisabled2 = 0;
private Object mLock = new Object();
private final Object mLock = new Object();
// encompasses lights-out mode and other flags defined on View
private int mSystemUiVisibility = 0;
private int mFullscreenStackSysUiVisibility;
@@ -926,6 +926,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub {
+ " pkg=" + tok.pkg
+ " token=" + tok.token);
}
pw.println(" mCurrentUserId=" + mCurrentUserId);
}
}
}