Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4bad064 authored by Richard Uhler's avatar Richard Uhler Committed by Bill Lin
Browse files

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: I724a4bc4d8f9d5ace682e4ea99e4027cdbed1b48
Merged-In: Ic007e44264647793c6271c3923c13c9e1736a9de
parent cda1a175

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

+2 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,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();

    }