Merge "Allow migration to SP to be rolled back by filesystem checkpoint"

This commit is contained in:
Eric Biggers
2022-11-14 22:16:49 +00:00
committed by Android (Google) Code Review
3 changed files with 48 additions and 34 deletions

View File

@@ -103,6 +103,7 @@ import com.android.internal.util.ConcurrentUtils;
import com.android.internal.util.EmergencyAffordanceManager;
import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.widget.ILockSettings;
import com.android.internal.widget.LockSettingsInternal;
import com.android.server.am.ActivityManagerService;
import com.android.server.ambientcontext.AmbientContextManagerService;
import com.android.server.appbinding.AppBindingService;
@@ -3019,6 +3020,14 @@ public final class SystemServer implements Dumpable {
t.traceEnd();
}, t);
t.traceBegin("LockSettingsThirdPartyAppsStarted");
LockSettingsInternal lockSettingsInternal =
LocalServices.getService(LockSettingsInternal.class);
if (lockSettingsInternal != null) {
lockSettingsInternal.onThirdPartyAppsStarted();
}
t.traceEnd();
t.traceBegin("StartSystemUI");
try {
startSystemUi(context, windowManagerF);