Skip to content

Commit d9cb95d

Browse files
author
Calin Juravle
committed
[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 46a81bd) Merged-In: I7104b961d2fc2de53ffea4c14cce6b785ff534dd Change-Id: I7104b961d2fc2de53ffea4c14cce6b785ff534dd
1 parent 347c14c commit d9cb95d

2 files changed

Lines changed: 0 additions & 33 deletions

File tree

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@
352352
import com.android.server.firewall.IntentFirewall;
353353
import com.android.server.job.JobSchedulerInternal;
354354
import com.android.server.pm.Installer;
355-
import com.android.server.pm.Installer.InstallerException;
356355
import com.android.server.uri.GrantUri;
357356
import com.android.server.uri.UriGrantsManagerInternal;
358357
import com.android.server.utils.PriorityDump;
@@ -364,8 +363,6 @@
364363
import com.android.server.wm.WindowManagerService;
365364
import com.android.server.wm.WindowProcessController;
366365

367-
import dalvik.system.VMRuntime;
368-
369366
import libcore.util.EmptyArray;
370367

371368
import java.io.File;
@@ -5201,26 +5198,6 @@ final void finishBooting() {
52015198
mCallFinishBooting = false;
52025199
}
52035200

5204-
ArraySet<String> completedIsas = new ArraySet<String>();
5205-
for (String abi : Build.SUPPORTED_ABIS) {
5206-
ZYGOTE_PROCESS.establishZygoteConnectionForAbi(abi);
5207-
final String instructionSet = VMRuntime.getInstructionSet(abi);
5208-
if (!completedIsas.contains(instructionSet)) {
5209-
try {
5210-
mInstaller.markBootComplete(VMRuntime.getInstructionSet(abi));
5211-
} catch (InstallerException e) {
5212-
if (!VMRuntime.didPruneDalvikCache()) {
5213-
// This is technically not the right filter, as different zygotes may
5214-
// have made different pruning decisions. But the log is best effort,
5215-
// anyways.
5216-
Slog.w(TAG, "Unable to mark boot complete for abi: " + abi + " (" +
5217-
e.getMessage() +")");
5218-
}
5219-
}
5220-
completedIsas.add(instructionSet);
5221-
}
5222-
}
5223-
52245201
IntentFilter pkgFilter = new IntentFilter();
52255202
pkgFilter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);
52265203
pkgFilter.addDataScheme("package");

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -431,16 +431,6 @@ public void destroyUserData(String uuid, int userId, int flags) throws Installer
431431
}
432432
}
433433

434-
public void markBootComplete(String instructionSet) throws InstallerException {
435-
assertValidInstructionSet(instructionSet);
436-
if (!checkBeforeRemote()) return;
437-
try {
438-
mInstalld.markBootComplete(instructionSet);
439-
} catch (Exception e) {
440-
throw InstallerException.from(e);
441-
}
442-
}
443-
444434
public void freeCache(String uuid, long targetFreeBytes, long cacheReservedBytes, int flags)
445435
throws InstallerException {
446436
if (!checkBeforeRemote()) return;

0 commit comments

Comments
 (0)