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

Commit adc71497 authored by Kang Li's avatar Kang Li Committed by android-build-merger
Browse files

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

am: f10b0d00

Change-Id: I6befef8d1f27666e5a6c721378ba5c02cc769947
parents 9a4b9a38 f10b0d00

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;