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 /src/com | |
| parent | bc6535cccf65265677ce4dfab1b34b71efb8fba5 (diff) | |
| download | packages_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 'src/com')
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 1 | ||||
| -rw-r--r-- | src/com/android/nfc/P2pEventManager.java | 2 | ||||
| -rw-r--r-- | src/com/android/nfc/SendUi.java | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index d0ae8c6..edbefbe 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -23,7 +23,6 @@ import com.android.nfc.DeviceHost.NfcDepEndpoint; import com.android.nfc.DeviceHost.TagEndpoint; import com.android.nfc.nxp.NativeNfcManager; import com.android.nfc.nxp.NativeNfcSecureElement; -import com.android.nfc3.R; import android.app.Application; import android.app.KeyguardManager; diff --git a/src/com/android/nfc/P2pEventManager.java b/src/com/android/nfc/P2pEventManager.java index 6a00b43..5677a6f 100644 --- a/src/com/android/nfc/P2pEventManager.java +++ b/src/com/android/nfc/P2pEventManager.java @@ -23,8 +23,6 @@ import android.os.Handler; import android.os.Message; import android.os.Vibrator; -import com.android.nfc3.R; - /** * Manages vibration, sound and animation for P2P events. */ diff --git a/src/com/android/nfc/SendUi.java b/src/com/android/nfc/SendUi.java index 37ac6e0..6fc24d5 100644 --- a/src/com/android/nfc/SendUi.java +++ b/src/com/android/nfc/SendUi.java @@ -16,8 +16,6 @@ package com.android.nfc; -import com.android.nfc3.R; - import android.animation.Animator; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; |