commit 862c46c9eec1220a629eb14254e5a12c6da17825
author Kelvin Zhang <zhangkelvin@google.com> Fri Sep 02 17:01:12 2022 +0000
committer Kelvin Zhang <zhangkelvin@google.com> Fri Sep 02 17:06:13 2022 +0000
tree 3862a03dff568b6551c6bb093b99ceabdcba8766
parent a10fd5a5b156bf36e4e701aa0fc3d7475aa23c72

Also skip SPL check for empty SPL strings

Test: th
Bug: 244525514


Change-Id: Ia5b94d115003caafa36c9ec46d167af930283752

payload_consumer/delta_performer.cc

diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 382f002..45103e6 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -395,6 +395,9 @@
   if (!manifest_.has_security_patch_level()) {
     return;
   }
+  if (manifest_.security_patch_level().empty()) {
+    return;
+  }
   const auto new_spl = manifest_.security_patch_level();
   const auto current_spl =
       android::base::GetProperty("ro.build.version.security_patch", "");