Merge "Prevent NPE in ContactsContract"

2016-02-05 21:30:38 +00:00
parent 2a2ec8640e da072b3e38
commit bb66a0edfe
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -2079,10 +2079,11 @@ public final class ContactsContract {
            if (preferHighres) {
                final Uri displayPhotoUri = Uri.withAppendedPath(contactUri,
                        Contacts.Photo.DISPLAY_PHOTO);
-                InputStream inputStream;
                try {
                    AssetFileDescriptor fd = cr.openAssetFileDescriptor(displayPhotoUri, "r");
-                    return fd.createInputStream();
+                    if (fd != null) {
+                        return fd.createInputStream();
+                    }
                } catch (IOException e) {
                    // fallback to the thumbnail code
                }