diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-21 14:55:50 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-11-21 15:17:07 -0800 |
| commit | 37bb7b23886d7c058f7e9589ee5522b4a467b1b0 (patch) | |
| tree | f903810b5de2dfab6d54c5c406f6a0783d219ae9 /AndroidManifest.xml | |
| parent | bc6535cccf65265677ce4dfab1b34b71efb8fba5 (diff) | |
| download | android_packages_apps_Nfc-37bb7b23886d7c058f7e9589ee5522b4a467b1b0.tar.gz android_packages_apps_Nfc-37bb7b23886d7c058f7e9589ee5522b4a467b1b0.tar.bz2 android_packages_apps_Nfc-37bb7b23886d7c058f7e9589ee5522b4a467b1b0.zip | |
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 'AndroidManifest.xml')
| -rwxr-xr-x | AndroidManifest.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3ce49b88..b896e071 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.nfc3" + package="com.android.nfc" android:sharedUserId="android.uid.nfc" android:sharedUserLabel="@string/nfcUserLabel" > @@ -20,7 +20,7 @@ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <uses-permission android:name="android.permission.VIBRATE" /> - <application android:name="com.android.nfc.NfcService" + <application android:name=".NfcService" android:icon="@drawable/icon" android:label="@string/app_name" android:persistent="true" @@ -29,13 +29,13 @@ <meta-data android:name="com.google.android.backup.api_key" android:value="AEdPqrEAAAAIEXGvR1H2lq6SEOC7O7rGHoAmAf-GHCR_EhLqzg" /> - <activity android:name="com.android.nfc.TechListChooserActivity" + <activity android:name=".TechListChooserActivity" android:theme="@*android:style/Theme.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" android:multiprocess="true" /> - <activity android:name="com.android.nfc.NfcRootActivity" + <activity android:name=".NfcRootActivity" android:theme="@*android:style/Theme.Translucent.NoTitleBar" android:excludeFromRecents="true" android:noHistory="true" |