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

Commit 607cadc9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents c0ee8e00 796514a1
Loading
Loading
Loading
Loading
+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;