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

Commit 7451334c authored by Rick Yiu's avatar Rick Yiu
Browse files

Revert "resolve merge conflicts of e6dddc99..." 

Revert "resolve merge conflicts of ca3425964ae63a69dc1e8bf8d9a09..."

Revert submission 10740208-resolve-merge

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=aosp_taimen-userdebug&lkgb=6310008&lkbb=6310735&fkbb=6310101, bug b/151887221

Reverted Changes:
I311042a72:resolve merge conflicts of e6dddc99...
I2d0615a6e:resolve merge conflicts of ca3425964ae63a69dc1e8bf...

Bug: 151887221
Change-Id: I3e29ca4902feb5e08930991fd69ff5cade72d54a
parent f096a5cc

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

+23 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ 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;
@@ -371,6 +372,8 @@ 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;










@@ -5237,6 +5240,26 @@ 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);













            }













        }



























        // Let the ART runtime in zygote and system_server know that the boot completed.















        ZYGOTE_PROCESS.bootCompleted();















        VMRuntime.bootCompleted();

































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



+10
−0






























Original line number
Diff line number
Diff line








@@ -434,6 +434,16 @@ 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;