commit ae17df286074a07b56ff1fafc03992f2ed063092
author Loic Poulain <loic.poulain@linaro.org> Mon Sep 11 18:40:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 11 18:40:15 2017 +0000
tree 221924c0f7948629cf448458b89f890deb01f876
parent 46eb4fffc8663686604c101ed723759343b6b5e2
parent 2a1fc3229b3d7a44241a72c564dcb0b205832640

Merge "hikey/hikey960: Add device admin feature"
am: 2a1fc3229b

Change-Id: I2e634b362eb466f2efd9afa225034abcd219ba18

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 38feb32..b5507da 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)