summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTa-wei Yen <twyen@google.com>2017-05-25 14:57:51 -0700
committerTa-wei Yen <twyen@google.com>2017-05-25 14:57:51 -0700
commit6af9c02cc29f6f9beda6e47bfbaf7afae1465ad3 (patch)
tree9cb60643ac05a094457ef7f7349bd4b15c076803
parent3ed0c281a143789ea8187dba60dba6c6b5db9009 (diff)
downloadandroid_packages_apps_Dialer-6af9c02cc29f6f9beda6e47bfbaf7afae1465ad3.tar.gz
android_packages_apps_Dialer-6af9c02cc29f6f9beda6e47bfbaf7afae1465ad3.tar.bz2
android_packages_apps_Dialer-6af9c02cc29f6f9beda6e47bfbaf7afae1465ad3.zip
Fix permissions missing in AOSP build
The voicemail module permissions are in a different manifest, and was not merged. Test: manual VVM smoke test Change-Id: I00c7abf16a5ed40d2d3b0e26463663e60fc8b05f Fixes: 38421210
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index f46e4d839..49cb3e47d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -140,6 +140,7 @@ DIALER_MANIFEST_FILES += \
$(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \
$(BASE_DIR)/incallui/wifi/AndroidManifest.xml \
$(BASE_DIR)/voicemail/impl/AndroidManifest.xml \
+ $(BASE_DIR)/voicemail/permissions.xml \
# Merge all manifest files.
@@ -426,4 +427,4 @@ LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_PREBUILT)
-include $(CLEAR_VARS) \ No newline at end of file
+include $(CLEAR_VARS)