diff options
| author | Jeff Hamilton <jham@android.com> | 2011-06-07 10:49:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-07 10:49:26 -0700 |
| commit | bad4dcc454a064f0c062f097d567a57633d1cb30 (patch) | |
| tree | a2befb26b647be84693db633395d13b7604f8be8 /src | |
| parent | 74e93e30798ab9b2110f54755bc98423b43a56f5 (diff) | |
| parent | 30f997de5f25657e583eda87de8b56638ec49884 (diff) | |
| download | packages_apps_nfc-bad4dcc454a064f0c062f097d567a57633d1cb30.zip packages_apps_nfc-bad4dcc454a064f0c062f097d567a57633d1cb30.tar.gz packages_apps_nfc-bad4dcc454a064f0c062f097d567a57633d1cb30.tar.bz2 | |
am 30f997de: am b8318ada: Merge "Fix a bug with absolute URI processing." into gingerbread
* commit '30f997de5f25657e583eda87de8b56638ec49884':
Fix a bug with absolute URI processing.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 9e64ed5..169d9d3 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -2635,7 +2635,7 @@ public class NfcService extends Application { } case NdefRecord.TNF_ABSOLUTE_URI: { - intent.setData(Uri.parse(new String(record.getPayload(), Charsets.UTF_8))); + intent.setData(Uri.parse(new String(type, Charsets.UTF_8))); return true; } @@ -2657,7 +2657,7 @@ public class NfcService extends Application { intent.setData(parseWellKnownUriRecord(subRecord)); return true; } else if (subTnf == NdefRecord.TNF_ABSOLUTE_URI) { - intent.setData(Uri.parse(new String(subRecord.getPayload(), + intent.setData(Uri.parse(new String(subRecord.getType(), Charsets.UTF_8))); return true; } |