commit 2a1fc3229b3d7a44241a72c564dcb0b205832640
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 11 18:16:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 11 18:16:02 2017 +0000
tree bd8795d66a1a54676c1a241fbe48cbec341334c1
parent 18db08aca529fa96ccc15e53a3ed71d2a23e596b
parent 3396ac0f95d08297054c6431fa29352d23fa2748

Merge "hikey/hikey960: Add device admin feature"

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 1e05ae0..ffba33c 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -94,7 +94,8 @@
         frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \
         frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \
         frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
-        frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
+        frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
+        frameworks/native/data/etc/android.software.device_admin.xml:system/etc/permissions/android.software.device_admin.xml
 
 # Include BT modules
 $(call inherit-product-if-exists, device/linaro/hikey/wpan/ti-wpan-products.mk)