summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-08-18 09:20:01 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-12-14 18:52:06 -0800
commit4608740c8f847c90fa4b734ffeb29d4bcef6008f (patch)
tree6d754a8a7338c8f21c1d4e39f19d2f5ec58cd392 /src
parent33de6d698f0ff30dd0382e99e5d80a7d8ee0ed5c (diff)
downloadandroid_packages_apps_Gallery2-4608740c8f847c90fa4b734ffeb29d4bcef6008f.tar.gz
android_packages_apps_Gallery2-4608740c8f847c90fa4b734ffeb29d4bcef6008f.tar.bz2
android_packages_apps_Gallery2-4608740c8f847c90fa4b734ffeb29d4bcef6008f.zip
Gallery2: Gallery force close during Customer Monkey test.
When browser is forbidden to start, the MENU_INPUT_URL menu will cause force close problem. When press MENU_INPUT_URL with browser is forbidden to start, it will show a toast to remain that can not load. CRs-Fixed: 710730 Change-Id: I8c8965dc87affc262ee1fda5e604dbb36f5642b7
Diffstat (limited to 'src')
-rwxr-xr-xsrc/org/codeaurora/gallery3d/video/StreamingHooker.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/org/codeaurora/gallery3d/video/StreamingHooker.java b/src/org/codeaurora/gallery3d/video/StreamingHooker.java
index fdcc14c50..7def5d8a0 100755
--- a/src/org/codeaurora/gallery3d/video/StreamingHooker.java
+++ b/src/org/codeaurora/gallery3d/video/StreamingHooker.java
@@ -1,11 +1,13 @@
package org.codeaurora.gallery3d.video;
+import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
import android.provider.Browser;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
+import android.widget.Toast;
import com.android.gallery3d.R;
import org.codeaurora.gallery3d.ext.MovieUtils;
@@ -61,7 +63,14 @@ public class StreamingHooker extends MovieHooker {
intent.setData(Uri.parse(URI_STR));
intent.putExtra(EXTRA_NAME, true);
intent.putExtra(Browser.EXTRA_APPLICATION_ID, APN_NAME);
- getContext().startActivity(intent);
+
+ try {
+ getContext().startActivity(intent);
+ } catch (ActivityNotFoundException e) {
+ Toast.makeText(getContext(),
+ R.string.fail_to_load, Toast.LENGTH_LONG).show();
+ }
+
if (LOG) {
Log.v(TAG, "gotoInputUrl() appName=" + APN_NAME);
}