From 17bfed91ccf43d5856ed74e52b60af5d480babac Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Wed, 10 Jul 2019 15:00:09 +0100 Subject: [PATCH] Fix NullPointerException. Fix a NullPointerException that can occur if a package with a recently created rollback is no longer installed on device when the device boots. Bug: 137135842 Test: atest CtsRollbackManagerHostTestCases Change-Id: Ic007e44264647793c6271c3923c13c9e1736a9de --- .../android/server/rollback/RollbackManagerServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index e107c9aedf38b..c7e2ca899d4e4 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -1289,7 +1289,8 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { private boolean packageVersionsEqual(VersionedPackage a, VersionedPackage b) { - return a.getPackageName().equals(b.getPackageName()) + return a != null && b != null + && a.getPackageName().equals(b.getPackageName()) && a.getLongVersionCode() == b.getLongVersionCode(); }