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

Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev

Browse Source 
am: f10b0d000e

Change-Id: I6befef8d1f27666e5a6c721378ba5c02cc769947
This commit is contained in:
Kang Li
2017-08-31 00:52:18 +00:00
committed by android-build-merger
parent 9a4b9a38db f10b0d000e
commit adc714972a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/app/ResolverComparator.java
View File

@@ -337,11 +337,13 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
final ResolverTarget rhsTarget = mTargetsDict.get(new ComponentName(
rhs.activityInfo.packageName, rhs.activityInfo.name));
final int selectProbabilityDiff = Float.compare(
if (lhsTarget != null && rhsTarget != null) {
final int selectProbabilityDiff = Float.compare(
rhsTarget.getSelectProbability(), lhsTarget.getSelectProbability());
if (selectProbabilityDiff != 0) {
return selectProbabilityDiff > 0 ? 1 : -1;
if (selectProbabilityDiff != 0) {
return selectProbabilityDiff > 0 ? 1 : -1;
}
}
}
}