summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorPolina Bondarenko <pbond@google.com>2017-01-13 15:13:45 +0100
committerPolina Bondarenko <pbond@google.com>2017-01-18 22:42:44 +0100
commitd7673c7cbada7b6acb53a43f3b8e472612f46853 (patch)
tree2cd575f8ccae1fa39ed63506e59f5eb961947918 /common
parentb05c26ff0214f56738279fb9bf1fbd713a8a2878 (diff)
downloadmarlin-d7673c7cbada7b6acb53a43f3b8e472612f46853.tar.gz
Enable FEATURE_TELEPHONY_CARRIERLOCK for marlin/sailfish.
Bug: 33480084 Test: cts Change-Id: I4fceac6a4e97f9f014be7079eebeca309e4f44b2
Diffstat (limited to 'common')
-rw-r--r--common/base.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/base.mk b/common/base.mk
index 3c8c9711..9da3ec55 100644
--- a/common/base.mk
+++ b/common/base.mk
@@ -803,7 +803,8 @@ PRODUCT_COPY_FILES := \
frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:system/etc/permissions/android.hardware.nfc.hcef.xml \
- frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml
+ frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml \
+ frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:system/etc/permissions/android.hardware.telephony.carrierlock.xml
# Bluetooth configuration files
#PRODUCT_COPY_FILES += \