commit ffd730ccbb0b8759426fa06765b26106ba188c71
author anwarg <anwarg@google.com> Wed Jul 10 18:02:23 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 10 18:02:23 2019 -0700
tree 94db64d212be57257981a7504b61f99b60d3a55d
parent 2d870152d93aaa406310ad9dd008b20ca1e6b1c1
parent 19bc3c67ab00f834dcb8e291257eb1035a4ec59b

Merge "Fix NullPointerException." into qt-dev
am: 19bc3c67ab

Change-Id: I5c53e569bcdf1a4069370421e0737714d681981a

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index 03c3830..08c1bb5 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 @@
 
 
     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();
     }