Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NullPointerException.

Browse Source 
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
This commit is contained in:
Richard Uhler
2019-07-10 15:00:09 +01:00
committed by Bill Lin
parent cda1a17516
commit b4bad064d8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
View File

@@ -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();
}