diff options
| author | Jeff Hamilton <jham@android.com> | 2011-06-17 16:19:33 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-06-17 16:19:33 -0500 |
| commit | fd77aaaa6b1b79ba0438a78e357aa877552830b1 (patch) | |
| tree | 0dec8d4b867d9ab7b39ac3a4e9787ef1e9a570df /src/com/android/browser | |
| parent | f3828cd09f12cbf2980af72187628a608db8e938 (diff) | |
| download | packages_apps_Browser-fd77aaaa6b1b79ba0438a78e357aa877552830b1.zip packages_apps_Browser-fd77aaaa6b1b79ba0438a78e357aa877552830b1.tar.gz packages_apps_Browser-fd77aaaa6b1b79ba0438a78e357aa877552830b1.tar.bz2 | |
Launch into browser when a URL is received over NFC.
Change-Id: I32c6dcc4e257a32a341b9c2f165cd3764da08b64
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/IntentHandler.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java index 8d1b784..4a8fa22 100644 --- a/src/com/android/browser/IntentHandler.java +++ b/src/com/android/browser/IntentHandler.java @@ -27,6 +27,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.nfc.NfcAdapter; import android.os.AsyncTask; import android.os.Bundle; import android.provider.Browser; @@ -95,6 +96,7 @@ public class IntentHandler { boolean activateVoiceSearch = RecognizerResultsIntent .ACTION_VOICE_SEARCH_RESULTS.equals(action); if (Intent.ACTION_VIEW.equals(action) + || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action) || Intent.ACTION_SEARCH.equals(action) || MediaStore.INTENT_ACTION_MEDIA_SEARCH.equals(action) || Intent.ACTION_WEB_SEARCH.equals(action) @@ -214,7 +216,8 @@ public class IntentHandler { if (intent != null && (intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0) { final String action = intent.getAction(); - if (Intent.ACTION_VIEW.equals(action)) { + if (Intent.ACTION_VIEW.equals(action) || + NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action)) { url = UrlUtils.smartUrlFilter(intent.getData()); if (url != null && url.startsWith("http")) { final Bundle pairs = intent |