summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-11-21 14:55:50 -0800
committerNick Pelly <npelly@google.com>2011-11-21 15:17:07 -0800
commit37bb7b23886d7c058f7e9589ee5522b4a467b1b0 (patch)
treef903810b5de2dfab6d54c5c406f6a0783d219ae9 /res
parentbc6535cccf65265677ce4dfab1b34b71efb8fba5 (diff)
downloadpackages_apps_nfc-37bb7b23886d7c058f7e9589ee5522b4a467b1b0.zip
packages_apps_nfc-37bb7b23886d7c058f7e9589ee5522b4a467b1b0.tar.gz
packages_apps_nfc-37bb7b23886d7c058f7e9589ee5522b4a467b1b0.tar.bz2
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with the regular platform certificate, instead of the custom signed NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle and just build it out of packages/apps/Nfc now. The package name is also reverted from com.android.nfc3 to com.android.nfc The NFC uid needs to get bumped (25 to 27) to allow the cert change. Bug: 5608249 Change-Id: I4437dff96f2529f0b9e7d8e65c21359c3eeccd0b
Diffstat (limited to 'res')
-rwxr-xr-xres/values/strings.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0963dc7..3fcf047 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name">Nfc Service</string>
- <string name="nfcUserLabel">Nfc</string>
<!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] -->
<string name="inbound_me_profile_title">Contact received over NFC</string>