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

Commit 92bfea6d authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into... 

Merge "Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev am: 630a49aa am: f03738d8" into oc-dr1-dev-plus-aosp
am: fa407b19

Change-Id: I23e715d92ff0f722d5828ccb9c0e96475e3f108e
parents 333f15c4 fa407b19

services/core/java/com/android/server/am/UserController.java

+1 −0
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ final class UserController { 
    void finishUserStopping(final int userId, final UserState uss) {

        // On to the next.

        final Intent shutdownIntent = new Intent(Intent.ACTION_SHUTDOWN);

        shutdownIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        // This is the result receiver for the final shutdown broadcast.

        final IIntentReceiver shutdownReceiver = new IIntentReceiver.Stub() {

            @Override

services/core/java/com/android/server/power/ShutdownThread.java

+2 −1
Original line number Diff line number Diff line
@@ -391,7 +391,8 @@ public final class ShutdownThread extends Thread { 
        // First send the high-level shut down broadcast.

        mActionDone = false;

        Intent intent = new Intent(Intent.ACTION_SHUTDOWN);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND

                | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        mContext.sendOrderedBroadcastAsUser(intent,

                UserHandle.ALL, null, br, mHandler, 0, null, null);