Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev (f10b0d00) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverComparator.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -337,6 +337,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		final ResolverTarget rhsTarget = mTargetsDict.get(new ComponentName(
		rhs.activityInfo.packageName, rhs.activityInfo.name));

		if (lhsTarget != null && rhsTarget != null) {
		final int selectProbabilityDiff = Float.compare(
		rhsTarget.getSelectProbability(), lhsTarget.getSelectProbability());

		@@ -345,6 +346,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {
		}
		}
		}
		}

		CharSequence sa = lhs.loadLabel(mPm);
		if (sa == null) sa = lhs.activityInfo.name;