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

Commit 2596f1e1 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Add deferral-until-active policy to ACTION_SHUTDOWN broadcast." into main

parents c16516bf 19965bc4

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

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.power; 


import android.app.ActivityManagerInternal;

import android.app.AlertDialog;

import android.app.BroadcastOptions;

import android.app.Dialog;

import android.app.IActivityManager;

import android.app.ProgressDialog;
@@ -493,6 +494,9 @@ public final class ShutdownThread extends Thread { 
        mActionDone = false;

        Intent intent = new Intent(Intent.ACTION_SHUTDOWN);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND | Intent.FLAG_RECEIVER_REGISTERED_ONLY);

        final Bundle opts = BroadcastOptions.makeBasic()

                .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE)

                .toBundle();

        final ActivityManagerInternal activityManagerInternal = LocalServices.getService(

                ActivityManagerInternal.class);

        activityManagerInternal.broadcastIntentWithCallback(intent,
@@ -502,7 +506,7 @@ public final class ShutdownThread extends Thread { 
                            Bundle extras, boolean ordered, boolean sticky, int sendingUser) {

                        mHandler.post(ShutdownThread.this::actionDone);

                    }

                }, null, UserHandle.USER_ALL, null, null, null);

                }, null, UserHandle.USER_ALL, null, null, opts);



        final long endTime = SystemClock.elapsedRealtime() + MAX_BROADCAST_TIME;

        synchronized (mActionDoneSync) {