diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2021-07-12 12:30:41 -0400 |
---|---|---|
committer | Kelvin Zhang <zhangkelvin@google.com> | 2021-07-12 12:40:07 -0400 |
commit | 8ff9d439a04a4bcc24b37a1e95a0b1f28cb84a41 (patch) | |
tree | c7046e3d07f3d89bc72ae756709eca27557f1941 | |
parent | fc2745ae54561e437d2539d77f0c8e4c9cc4c88c (diff) | |
download | base-8ff9d439a04a4bcc24b37a1e95a0b1f28cb84a41.tar.gz |
Fix a potential NPE when allocating space for compressed apex
Bug: 189369298
Test: th
Change-Id: I9357be8021e77fc8c3839f15a4a53c2a3c63cb13
-rw-r--r-- | services/core/java/com/android/server/recoverysystem/RecoverySystemService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java b/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java index ed4a7bf107d1..1b4e36b6c464 100644 --- a/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java +++ b/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java @@ -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; |