Merge "Fix NullPointerException." into qt-dev

am: 19bc3c67ab Change-Id: Iec08afae474994508c1d666938b844a8b2544ee6
2019-07-10 18:05:47 -07:00
parent e131c48304 19bc3c67ab
commit f0d5906593
1 changed files with 2 additions and 1 deletions
--- 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();
    }