From 097b4ed4100369862793cf4f0fbbb969b50c154e Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Mon, 21 Nov 2011 14:55:59 -0800 Subject: [PATCH] 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: I5e178b469e5210cd231ba5f4ea57aa666b3d8893 --- include/private/android_filesystem_config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 2cc673f39..ce1e55dca 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -58,8 +58,9 @@ #define AID_UNUSED1 1022 /* deprecated, DO NOT USE */ #define AID_MEDIA_RW 1023 /* internal media storage write access */ #define AID_MTP 1024 /* MTP USB driver access */ -#define AID_NFC 1025 /* nfc subsystem */ +#define AID_UNUSED2 1025 /* deprecated, DO NOT USE */ #define AID_DRMRPC 1026 /* group for drm rpc */ +#define AID_NFC 1027 /* nfc subsystem */ #define AID_SHELL 2000 /* adb and debug shell user */ #define AID_CACHE 2001 /* cache access */