Fix a potential NPE when allocating space for compressed apex
Bug: 189369298 Test: th Change-Id: I9357be8021e77fc8c3839f15a4a53c2a3c63cb13
This commit is contained in:
@@ -968,6 +968,12 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
CompressedApexInfoList apexInfoList = getCompressedApexInfoList(packageFile);
|
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 apexManager = ApexManager.getInstance();
|
||||||
apexManager.reserveSpaceForCompressedApex(apexInfoList);
|
apexManager.reserveSpaceForCompressedApex(apexInfoList);
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user