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

Commit 2fbf4d5e authored by Adrian Roos's avatar Adrian Roos
Browse files

Move UiMode broadcasts to foreground 

Fixes an issue where the UiMode broadcasts were
delivered on the background queue, which meant
significant delays until the UI adjusts.

Change-Id: Ib4e2f09c1b9c59fdc704504c51d07e94731eaba3
Fixes: 28568349
parent b4d876a5

services/core/java/com/android/server/UiModeManagerService.java

+8 −3
Original line number Diff line number Diff line
@@ -466,9 +466,8 @@ final class UiModeManagerService extends SystemService { 
        if (mCarModeEnabled) {

            if (mLastBroadcastState != Intent.EXTRA_DOCK_STATE_CAR) {

                adjustStatusBarCarModeLocked();



                if (oldAction != null) {

                    getContext().sendBroadcastAsUser(new Intent(oldAction), UserHandle.ALL);

                    sendForegroundBroadcastToAllUsers(oldAction);

                }

                mLastBroadcastState = Intent.EXTRA_DOCK_STATE_CAR;

                action = UiModeManager.ACTION_ENTER_CAR_MODE;
@@ -476,7 +475,7 @@ final class UiModeManagerService extends SystemService { 
        } else if (isDeskDockState(mDockState)) {

            if (!isDeskDockState(mLastBroadcastState)) {

                if (oldAction != null) {

                    getContext().sendBroadcastAsUser(new Intent(oldAction), UserHandle.ALL);

                    sendForegroundBroadcastToAllUsers(oldAction);

                }

                mLastBroadcastState = mDockState;

                action = UiModeManager.ACTION_ENTER_DESK_MODE;
@@ -502,6 +501,7 @@ final class UiModeManagerService extends SystemService { 
            Intent intent = new Intent(action);

            intent.putExtra("enableFlags", enableFlags);

            intent.putExtra("disableFlags", disableFlags);

            intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            getContext().sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT, null,

                    mResultReceiver, null, Activity.RESULT_OK, null, null);
@@ -550,6 +550,11 @@ final class UiModeManagerService extends SystemService { 
        }

    }



    private void sendForegroundBroadcastToAllUsers(String action) {

        getContext().sendBroadcastAsUser(new Intent(action)

                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND), UserHandle.ALL);

    }



    private void updateAfterBroadcastLocked(String action, int enableFlags, int disableFlags) {

        // Launch a dock activity

        String category = null;