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

Commit 21acc0c4 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "ActivityManager: Make bootcomplete marker failure a warning" into nyc-dev 

am: 65e22a20

* commit '65e22a20':
  ActivityManager: Make bootcomplete marker failure a warning

Change-Id: Ic9ee4c8f5de567debb4a34c8a4dc5fbb075e37dd
parents 610953d3 65e22a20

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

+2 −1
Original line number Diff line number Diff line
@@ -6599,7 +6599,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
                try {

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

                } catch (InstallerException e) {

                    Slog.e(TAG, "Unable to mark boot complete for abi: " + abi, e);

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

                            e.getMessage() +")");

                }

                completedIsas.add(instructionSet);

            }