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

Commit d9cb95d5 authored by Calin Juravle's avatar Calin Juravle
Browse files

[framework] Remove boot complete marker 

ART doesn't load the boot image from /data anymore and the marker is
useless.

Test: device boots
Bug: 143899228

(cherry picked from commit 46a81bda)

Merged-In: I7104b961d2fc2de53ffea4c14cce6b785ff534dd
Change-Id: I7104b961d2fc2de53ffea4c14cce6b785ff534dd
parent 347c14cb

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

+0 −23
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ import com.android.server.contentcapture.ContentCaptureManagerInternal; 
import com.android.server.firewall.IntentFirewall;

import com.android.server.job.JobSchedulerInternal;

import com.android.server.pm.Installer;

import com.android.server.pm.Installer.InstallerException;

import com.android.server.uri.GrantUri;

import com.android.server.uri.UriGrantsManagerInternal;

import com.android.server.utils.PriorityDump;
@@ -364,8 +363,6 @@ import com.android.server.wm.ActivityTaskManagerService; 
import com.android.server.wm.WindowManagerService;

import com.android.server.wm.WindowProcessController;













import dalvik.system.VMRuntime;



























import libcore.util.EmptyArray;





























import java.io.File;










@@ -5201,26 +5198,6 @@ public class ActivityManagerService extends IActivityManager.Stub













            mCallFinishBooting = false;















        }



























        ArraySet<String> completedIsas = new ArraySet<String>();













        for (String abi : Build.SUPPORTED_ABIS) {













            ZYGOTE_PROCESS.establishZygoteConnectionForAbi(abi);













            final String instructionSet = VMRuntime.getInstructionSet(abi);













            if (!completedIsas.contains(instructionSet)) {













                try {













                    mInstaller.markBootComplete(VMRuntime.getInstructionSet(abi));













                } catch (InstallerException e) {













                    if (!VMRuntime.didPruneDalvikCache()) {













                        // This is technically not the right filter, as different zygotes may













                        // have made different pruning decisions. But the log is best effort,













                        // anyways.













                        Slog.w(TAG, "Unable to mark boot complete for abi: " + abi + " (" +













                                e.getMessage() +")");













                    }













                }













                completedIsas.add(instructionSet);













            }













        }



























        IntentFilter pkgFilter = new IntentFilter();















        pkgFilter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);















        pkgFilter.addDataScheme("package");

































services/core/java/com/android/server/pm/Installer.java



+0
−10




























Original line number
Diff line number
Diff line








@@ -431,16 +431,6 @@ public class Installer extends SystemService {













        }















    }





























    public void markBootComplete(String instructionSet) throws InstallerException {













        assertValidInstructionSet(instructionSet);













        if (!checkBeforeRemote()) return;













        try {













            mInstalld.markBootComplete(instructionSet);













        } catch (Exception e) {













            throw InstallerException.from(e);













        }













    }





























    public void freeCache(String uuid, long targetFreeBytes, long cacheReservedBytes, int flags)















            throws InstallerException {















        if (!checkBeforeRemote()) return;