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

Commit b492ced8 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev

parents c96e6f19 9dc6c61a

core/java/android/content/IntentFilter.java

+2 −2
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ public class IntentFilter implements Parcelable { 
     * {@link #MATCH_CATEGORY_PORT}, {@link #NO_MATCH_DATA}.

     */

    public final int matchDataAuthority(Uri data) {

        if (mDataAuthorities == null) {

        if (mDataAuthorities == null || data == null) {

            return NO_MATCH_DATA;

        }

        final int numDataAuthorities = mDataAuthorities.size();
@@ -1277,7 +1277,7 @@ public class IntentFilter implements Parcelable { 
            }



            final ArrayList<PatternMatcher> schemeSpecificParts = mDataSchemeSpecificParts;

            if (schemeSpecificParts != null) {

            if (schemeSpecificParts != null && data != null) {

                match = hasDataSchemeSpecificPart(data.getSchemeSpecificPart())

                        ? MATCH_CATEGORY_SCHEME_SPECIFIC_PART : NO_MATCH_DATA;

            }