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

Commit 314687f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix a potential NPE when allocating space for compressed apex" into sc-dev am: 607cadc9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328970

Change-Id: I191fead109858ebf38cff2cb11aa698ffdf92e4a
parents 86d3bbb4 607cadc9

services/core/java/com/android/server/recoverysystem/RecoverySystemService.java

+6 −0
Original line number Diff line number Diff line
@@ -970,6 +970,12 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo 
        final long token = Binder.clearCallingIdentity();

        try {

            CompressedApexInfoList apexInfoList = getCompressedApexInfoList(packageFile);

            if (apexInfoList == null) {

                Log.i(TAG, "apex_info.pb not present in OTA package. "

                            + "Assuming device doesn't support compressed"

                            + "APEX, continueing without allocating space.");

                return true;

            }

            ApexManager apexManager = ApexManager.getInstance();

            apexManager.reserveSpaceForCompressedApex(apexInfoList);

            return true;