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

Commit e8433a17 authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

Move Checkpoint commit to finishBooting 

Checkpoint committing is not a per user thing. Moving to finishBooting

Bug: 118932054
Test: Verify checkpoint is commited after boot complete
Change-Id: I4bef12462277fbc7615451cf9683893b56caeee3
parent 3224130f

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

+13 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.Parcel;

import android.os.ParcelFileDescriptor;

import android.os.PowerManager;

import android.os.PowerManager.ServiceType;

import android.os.PowerManagerInternal;

import android.os.Process;
@@ -268,6 +269,7 @@ import android.os.TransactionTooLargeException; 
import android.os.UserHandle;

import android.os.UserManager;

import android.os.WorkSource;

import android.os.storage.IStorageManager;

import android.os.storage.StorageManager;

import android.provider.Settings;

import android.sysprop.VoldProperties;
@@ -306,6 +308,7 @@ import com.android.internal.app.IAppOpsService; 
import com.android.internal.app.ProcessMap;

import com.android.internal.app.SystemUserHomeActivity;

import com.android.internal.app.procstats.ProcessStats;

import com.android.internal.content.PackageHelper;

import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.os.BackgroundThread;
@@ -5020,6 +5023,16 @@ public class ActivityManagerService extends IActivityManager.Stub 
            }

        }, dumpheapFilter);













        // Inform checkpointing systems of success













        try {













            IStorageManager storageManager = PackageHelper.getStorageManager();













            storageManager.commitChanges();













        } catch (Exception e) {













            PowerManager pm = (PowerManager)













                     mInjector.getContext().getSystemService(Context.POWER_SERVICE);













            pm.reboot("Checkpoint commit failed");













        }



























        // Let system services know.















        mSystemServiceManager.startBootPhase(SystemService.PHASE_BOOT_COMPLETED);















































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



+0
−9






























Original line number
Diff line number
Diff line








@@ -67,7 +67,6 @@ import android.os.IRemoteCallback;













import android.os.IUserManager;















import android.os.Looper;















import android.os.Message;













import android.os.PowerManager;















import android.os.Process;















import android.os.RemoteCallbackList;















import android.os.RemoteException;










@@ -335,14 +334,6 @@ class UserController implements Handler.Callback {













                return;















            }















        }













        // Inform checkpointing systems of success













        try {













            getStorageManager().commitChanges();













        } catch (Exception e) {













            PowerManager pm = (PowerManager)













                     mInjector.getContext().getSystemService(Context.POWER_SERVICE);













            pm.reboot("Checkpoint commit failed");













        }































        // We always walk through all the user lifecycle states to send















        // consistent developer events. We step into RUNNING_LOCKED here,