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

Merge "Improve dump of status bar service" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2014-11-03 14:56:47 +00:00
committed by Android (Google) Code Review
parent f3aa1c8d79 53f28eccc5
commit 862d72e2f4
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/statusbar/IStatusBarService.aidl
View File

@@ -51,7 +51,7 @@ interface IStatusBarService
void onNotificationVisibilityChanged( void onNotificationVisibilityChanged(
in String[] newlyVisibleKeys, in String[] noLongerVisibleKeys); in String[] newlyVisibleKeys, in String[] noLongerVisibleKeys);
void onNotificationExpansionChanged(in String key, in boolean userAction, in boolean expanded); void onNotificationExpansionChanged(in String key, in boolean userAction, in boolean expanded);
void setSystemUiVisibility(int vis, int mask); void setSystemUiVisibility(int vis, int mask, String cause);
void setWindowState(int window, int state); void setWindowState(int window, int state);
void showRecentApps(boolean triggeredFromAltTab); void showRecentApps(boolean triggeredFromAltTab);

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java
View File

@@ -171,7 +171,8 @@ public final class NavigationBarTransitions extends BarTransitions {
applyLightsOut(false, false, false); applyLightsOut(false, false, false);
try { try {
mBarService.setSystemUiVisibility(0, View.SYSTEM_UI_FLAG_LOW_PROFILE); mBarService.setSystemUiVisibility(0, View.SYSTEM_UI_FLAG_LOW_PROFILE,
"LightsOutListener");
} catch (android.os.RemoteException ex) { } catch (android.os.RemoteException ex) {
} }
} }

5
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -5920,7 +5920,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
private int updateSystemUiVisibilityLw() { private int updateSystemUiVisibilityLw() {
// If there is no window focused, there will be nobody to handle the events // If there is no window focused, there will be nobody to handle the events
// anyway, so just hang on in whatever state we're in until things settle down. // anyway, so just hang on in whatever state we're in until things settle down.
WindowState win = mFocusedWindow != null ? mFocusedWindow : mTopFullscreenOpaqueWindowState; final WindowState win = mFocusedWindow != null ? mFocusedWindow
: mTopFullscreenOpaqueWindowState;
if (win == null) { if (win == null) {
return 0; return 0;
} }
@@ -5956,7 +5957,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
try { try {
IStatusBarService statusbar = getStatusBarService(); IStatusBarService statusbar = getStatusBarService();
if (statusbar != null) { if (statusbar != null) {
statusbar.setSystemUiVisibility(visibility, 0xffffffff); statusbar.setSystemUiVisibility(visibility, 0xffffffff, win.toString());
statusbar.topAppWindowChanged(needsMenu); statusbar.topAppWindowChanged(needsMenu);
} }
} catch (RemoteException e) { } catch (RemoteException e) {

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

@@ -353,7 +353,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub {
} }
@Override @Override
public void setSystemUiVisibility(int vis, int mask) { public void setSystemUiVisibility(int vis, int mask, String cause) {
// also allows calls from window manager which is in this process. // also allows calls from window manager which is in this process.
enforceStatusBarService(); enforceStatusBarService();
@@ -365,7 +365,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub {
mCurrentUserId, mCurrentUserId,
vis & StatusBarManager.DISABLE_MASK, vis & StatusBarManager.DISABLE_MASK,
mSysUiVisToken, mSysUiVisToken,
"WindowManager.LayoutParams"); cause);
} }
} }