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

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

Browse Source
This commit is contained in:
Dianne Hackborn
2015-07-29 00:45:18 +00:00
committed by Android (Google) Code Review
parent c96e6f1993 9dc6c61a80
commit b492ced89e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/IntentFilter.java
View File

@@ -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;
}