From 4dccc478f8a2424a96f7080a4ce85b15d20bf6f1 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 25 Jan 2019 13:58:33 +0000
Subject: Move Dialer to /product

This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product.

Also make the app inherit its privapp permission grant.

Bug: 122353713
Test: launch dialer on aosp_blueline
Change-Id: I5ed4dc4360c8a873da153b71a0ec19ff8695e85a
---
 Android.mk   | 2 ++
 CleanSpec.mk | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Android.mk b/Android.mk
index 0eb26e424..eb6798cb7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -175,7 +175,9 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := Dialer
 LOCAL_CERTIFICATE := shared
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_MODULE := true
 LOCAL_USE_AAPT2 := true
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.dialer
 
 include $(BUILD_PACKAGE)
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
index fecdf7929..960bd75ad 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -39,3 +39,4 @@
 # ************************************************
 
 $(call add-clean-step, (cd packages/apps/Dialer; git clean -f java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java >&2) || true)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Dialer)
-- 
cgit v1.2.3