commit 9e1bd629710aa2c726104beadbe9ec97629ddf6d
author Polina Bondarenko <pbond@google.com> Fri Jan 13 15:13:45 2017 +0100
committer Polina Bondarenko <pbond@google.com> Wed Jan 18 22:44:53 2017 +0100
tree 84d312d6d74019028e10c779de7538693a9fe29b
parent 1e4dfe2844f6b454c56410dd224fb0d930fdfd8c

Enable FEATURE_TELEPHONY_CARRIERLOCK for marlin/sailfish.

Bug: 33480084
Test: cts

Merged-In: I4fceac6a4e97f9f014be7079eebeca309e4f44b2

Change-Id: I4fceac6a4e97f9f014be7079eebeca309e4f44b2

common/base.mk

diff --git a/common/base.mk b/common/base.mk
index 00acbb1..c6cad2c 100644
--- a/common/base.mk
+++ b/common/base.mk
@@ -800,7 +800,8 @@
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
     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/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 += \