summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-03-25 21:07:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-25 21:07:34 +0000
commit16802f0de28cce0616e19b800d8b8a2b17c47405 (patch)
tree16dd203a9f7612639515004143218646857b0508 /core
parentaa99a1c4b6b3e7cb80cba199b4cd3b59099075b1 (diff)
parent46c953138298285d9cb06a75030fc73081ccc121 (diff)
downloadframeworks_base-16802f0de28cce0616e19b800d8b8a2b17c47405.zip
frameworks_base-16802f0de28cce0616e19b800d8b8a2b17c47405.tar.gz
frameworks_base-16802f0de28cce0616e19b800d8b8a2b17c47405.tar.bz2
am 46c95313: am ddb30cd3: am 7506f499: Merge "Fix to crash when clicking text link without view activity"
* commit '46c953138298285d9cb06a75030fc73081ccc121': Fix to crash when clicking text link without view activity
Diffstat (limited to 'core')
-rw-r--r--core/java/android/text/style/URLSpan.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/text/style/URLSpan.java b/core/java/android/text/style/URLSpan.java
index d29bfb6..0669b6f 100644
--- a/core/java/android/text/style/URLSpan.java
+++ b/core/java/android/text/style/URLSpan.java
@@ -16,6 +16,7 @@
package android.text.style;
+import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@@ -23,6 +24,7 @@ import android.os.Parcel;
import android.provider.Browser;
import android.text.ParcelableSpan;
import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
public class URLSpan extends ClickableSpan implements ParcelableSpan {
@@ -59,6 +61,10 @@ public class URLSpan extends ClickableSpan implements ParcelableSpan {
Context context = widget.getContext();
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
- context.startActivity(intent);
+ try {
+ context.startActivity(intent);
+ } catch (ActivityNotFoundException e) {
+ Log.w("URLSpan", "Actvity was not found for intent, " + intent.toString());
+ }
}
}