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

Commit 0f99c1e7 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 

am: adc71497

Change-Id: Ie23c44a463fdd07be590c136fdda55bc0f6f0220
parents 32f14d3f adc71497

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;