Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	res/values-cs/strings.xml

Change-Id: Idceee08cb4d6f69e4f8cc4c043142852ac932e7f

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/android/providers/downloads/OpenHelper.java b/src/com/android/providers/downloads/OpenHelper.java
index 5a92316b..184cdb3d 100644
--- a/src/com/android/providers/downloads/OpenHelper.java
+++ b/src/com/android/providers/downloads/OpenHelper.java
@@ -31,6 +31,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.Downloads.Impl.RequestHeaders;
 
+import java.io.File;
+
 public class OpenHelper {
     /**
      * Build an {@link Intent} to view the download at current {@link Cursor}
@@ -48,9 +50,9 @@ public class OpenHelper {
             }
 
             final Uri localUri = getCursorUri(cursor, COLUMN_LOCAL_URI);
-            final String filename = getCursorString(cursor, COLUMN_LOCAL_FILENAME);
+            final File file = getCursorFile(cursor, COLUMN_LOCAL_FILENAME);
             String mimeType = getCursorString(cursor, COLUMN_MEDIA_TYPE);
-            mimeType = DownloadDrmHelper.getOriginalMimeType(context, filename, mimeType);
+            mimeType = DownloadDrmHelper.getOriginalMimeType(context, file, mimeType);
 
             final Intent intent = new Intent(Intent.ACTION_VIEW);
             intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -131,4 +133,8 @@ public class OpenHelper {
     private static long getCursorLong(Cursor cursor, String column) {
         return cursor.getLong(cursor.getColumnIndexOrThrow(column));
     }
+
+    private static File getCursorFile(Cursor cursor, String column) {
+        return new File(cursor.getString(cursor.getColumnIndexOrThrow(column)));
+    }
 }