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

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

Browse Source 
am: f0d5906593

Change-Id: Id9c8851a3a3e493c47a4bb100c953723289be1fe
This commit is contained in:
anwarg
2019-07-10 18:21:28 -07:00
committed by android-build-merger
parent 4127f3b98a f0d5906593
commit 15d2c9c818
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

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