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

Commit 0841c516 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 43fac87f: am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 

* commit '43fac87f':
  Avoid NPE when ProviderInfo is missing.
parents 1ec1d556 43fac87f

core/java/android/provider/DocumentsContract.java

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ public final class DocumentsContract { 


        final ProviderInfo info = context.getPackageManager()

                .resolveContentProvider(uri.getAuthority(), PackageManager.GET_META_DATA);

        if (info.metaData != null && info.metaData.containsKey(

        if (info != null && info.metaData != null && info.metaData.containsKey(

                DocumentsContract.META_DATA_DOCUMENT_PROVIDER)) {

            return true;

        }