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

Commit 8af07f47 authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev 

* commit '862d72e2':
  Improve dump of status bar service
parents d99ae193 862d72e2

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ interface IStatusBarService 
    void onNotificationVisibilityChanged(

            in String[] newlyVisibleKeys, in String[] noLongerVisibleKeys);

    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 showRecentApps(boolean triggeredFromAltTab);

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

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ public final class NavigationBarTransitions extends BarTransitions { 
                applyLightsOut(false, false, false);



                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) {

                }

            }

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -5920,7 +5920,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    private int updateSystemUiVisibilityLw() {

        // 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.

        WindowState win = mFocusedWindow != null ? mFocusedWindow : mTopFullscreenOpaqueWindowState;

        final WindowState win = mFocusedWindow != null ? mFocusedWindow

                : mTopFullscreenOpaqueWindowState;

        if (win == null) {

            return 0;

        }
@@ -5956,7 +5957,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    try {

                        IStatusBarService statusbar = getStatusBarService();

                        if (statusbar != null) {

                            statusbar.setSystemUiVisibility(visibility, 0xffffffff);

                            statusbar.setSystemUiVisibility(visibility, 0xffffffff, win.toString());

                            statusbar.topAppWindowChanged(needsMenu);

                        }

                    } catch (RemoteException e) {

services/core/java/com/android/server/statusbar/StatusBarManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub { 
    }



    @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.

        enforceStatusBarService();
@@ -365,7 +365,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub { 
                    mCurrentUserId,

                    vis & StatusBarManager.DISABLE_MASK,

                    mSysUiVisToken,

                    "WindowManager.LayoutParams");

                    cause);

        }

    }