Some Android models don't handle the file content provider properly apparently. See bug for more information.

BUG=345393

Review URL: https://codereview.chromium.org/174073013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252961 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 0 deletions

diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
index 56c432c..4e7509f 100644
--- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
+++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
@@ -134,6 +134,7 @@ class SelectFileDialog implements WindowAndroid.IntentCallback{
      *  or an empty string otherwise.
      */
     private String resolveFileName(Uri uri, ContentResolver contentResolver) {
+        if (contentResolver == null || uri == null) return "";
         Cursor cursor = null;
         try {
             cursor = contentResolver.query(uri, null, null, null, null);
@@ -143,6 +144,10 @@ class SelectFileDialog implements WindowAndroid.IntentCallback{
                 int index = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
                 if (index > -1) return cursor.getString(index);
             }
+        } catch (NullPointerException e) {
+            // Some android models don't handle the provider call correctly.
+            // see crbug.com/345393
+            return "";
         } finally {
             if (cursor != null ) {
                 cursor.close();