NFC Fix

Conflicts: system.prop
dazjo · May 5, 2013 · f2603b7 · f2603b7
1 parent 9123609
commit f2603b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -57,6 +57,9 @@ BOARD_ADRENO_DECIDE_TEXTURE_TARGET := true
 BOARD_AVOID_DRAW_TEXTURE_EXTENSION := true
 TARGET_GRALLOC_USES_ASHMEM := true
 
+# Enable NFC
+BOARD_HAVE_NFC := true
+
 # Web Rendering
 ENABLE_WEBGL := true
 TARGET_FORCE_CPU_UPLOAD := true

diff --git a/device.mk b/device.mk
@@ -99,6 +99,7 @@ PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
     frameworks/base/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
     frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
+    frameworks/base/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
     frameworks/base/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
     frameworks/base/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
     frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
@@ -107,8 +108,7 @@ PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
     frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
     frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
-    frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
-    frameworks/base/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml
+    frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
 
 PRODUCT_TAGS += dalvik.gc.type-precise
 

diff --git a/system.prop b/system.prop
@@ -25,12 +25,6 @@ ro.confg.hw_appversion=U8815VCM9_KERNEL
 # Memory
 sys.mem.max_hidden_apps=10
 
-# NFC
-ro.config.hw_accesscontrol=true
-ro.config.hw_smartcardservice=true
-ro.config.nfc.card_setting=false
-ro.nfc.port=I2C
-
 # Qualcomm
 com.qc.hardware=true
 debug.composition.7x27A.type=mdp