summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-03-25 16:35:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-25 16:35:37 +0000
commit7506f499b523d05c6bca5acb6d83f55820d33771 (patch)
tree81e8e12a4d08907411cadfd7de2ed3749939fa6a /core/java
parent82f6b16e10a116a42e32c99c34fb2d435da21fd5 (diff)
parent7bd9b7f73d2acead67a2bd5995bd56140ae3c4df (diff)
downloadframeworks_base-7506f499b523d05c6bca5acb6d83f55820d33771.zip
frameworks_base-7506f499b523d05c6bca5acb6d83f55820d33771.tar.gz
frameworks_base-7506f499b523d05c6bca5acb6d83f55820d33771.tar.bz2
Merge "Fix to crash when clicking text link without view activity"
Diffstat (limited to 'core/java')
-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());
+ }
}
}