Promotion of android_ui.lnx.2.1.c1-00044.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2003220   I32bfb4a9c8230500d2f2e4750232fc1ac2f1ad61   SnapdragonGallery: Fix crash of viewing download uri

Change-Id: Icaf0929005b82d4a40a1b62b0b208cdcedd7d733
CRs-Fixed: 2003220

1 files changed, 23 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index bdcc0c6b4..9f4b8eeb3 100755
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -27,6 +27,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
+import android.content.UriMatcher;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -91,6 +92,17 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
     public static final String KEY_FROM_SNAPCAM = "from-snapcam";
     public static final String KEY_TOTAL_NUMBER = "total-number";
 
+    private static final int ALL_DOWNLOADS = 1;
+    private static final int ALL_DOWNLOADS_ID = 2;
+    private static final UriMatcher sURIMatcher =
+            new UriMatcher(UriMatcher.NO_MATCH);
+    public static final String PERMISSION_ACCESS_ALL =
+            "android.permission.ACCESS_ALL_DOWNLOADS";
+    static {
+        sURIMatcher.addURI("downloads", "all_downloads", ALL_DOWNLOADS);
+        sURIMatcher.addURI("downloads", "all_downloads/#", ALL_DOWNLOADS_ID);
+    }
+
     private static final String TAG = "GalleryActivity";
     private Dialog mVersionCheckDialog;
     private ListView mDrawerListView;
@@ -366,6 +378,17 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
         } else if (Intent.ACTION_VIEW.equalsIgnoreCase(action)
                 || ACTION_REVIEW.equalsIgnoreCase(action)){
             mDrawerLayoutSupported = false;
+            Uri uri = intent.getData();
+            int flag = intent.getFlags();
+            int match = sURIMatcher.match(uri);
+            if ((match == ALL_DOWNLOADS || match == ALL_DOWNLOADS_ID) &&
+                   (flag & Intent.FLAG_GRANT_READ_URI_PERMISSION) == 0) {
+                if (checkCallingOrSelfPermission(
+                        PERMISSION_ACCESS_ALL) != PackageManager.PERMISSION_GRANTED) {
+                    Log.w(TAG, "no permission to view: " + uri);
+                    return;
+                }
+            }
             startViewAction(intent);
         } else {
             mDrawerLayoutSupported = true;