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

Commit f77e426c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "QuickBoot: Don't handle SHUTDOWN broadcast from QuickBoot"

parents 15a6787d 26bb2a2c

services/java/com/android/server/content/SyncManager.java

+3 −0
Original line number Diff line number Diff line
@@ -337,6 +337,9 @@ public class SyncManager { 
            new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            boolean fromQuickBoot = intent.getBooleanExtra("from_quickboot", false);

            if (fromQuickBoot) return;



            Log.w(TAG, "Writing sync state before shutdown...");

            getSyncStorageEngine().writeAllState();

        }

services/java/com/android/server/net/NetworkStatsService.java

+3 −0
Original line number Diff line number Diff line
@@ -785,6 +785,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
    private BroadcastReceiver mShutdownReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            boolean fromQuickBoot = intent.getBooleanExtra("from_quickboot", false);

            if (fromQuickBoot) return;



            // SHUTDOWN is protected broadcast.

            synchronized (mStatsLock) {

                shutdownLocked();