Merge "Fix crash when receive wrong intent" (49174aff) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/GalleryActivity.java

+12 −8

Original line number	Original line	Diff line number	Diff line
	@@ -357,6 +357,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
	\|\| ACTION_REVIEW.equalsIgnoreCase(action)){		\|\| ACTION_REVIEW.equalsIgnoreCase(action)){
	mDrawerLayoutSupported = false;		mDrawerLayoutSupported = false;
	Uri uri = intent.getData();		Uri uri = intent.getData();
			if (uri != null) {
	int flag = intent.getFlags();		int flag = intent.getFlags();
	int match = sURIMatcher.match(uri);		int match = sURIMatcher.match(uri);
	if ((match == ALL_DOWNLOADS \|\| match == ALL_DOWNLOADS_ID) &&		if ((match == ALL_DOWNLOADS \|\| match == ALL_DOWNLOADS_ID) &&
	@@ -367,6 +368,9 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
	return;		return;
	}		}
	}		}
			} else {
			Log.w(TAG, "uri get from intent is null");
			}
	startViewAction(intent);		startViewAction(intent);
	} else {		} else {
	mDrawerLayoutSupported = true;		mDrawerLayoutSupported = true;