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

Commit dc7fc8bb 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" am: 2a0c9de5 

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

Change-Id: I7a17c2de6d487aafb0b053a64c69616ecc811932
parents 8369d0c1 2a0c9de5

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

+6 −0
Original line number Diff line number Diff line
@@ -968,6 +968,12 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo 
        }

        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;