From a46382df776975e40940436bb27fe3c6ced9d962 Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@gmail.com>
Date: Wed, 21 Feb 2018 13:45:40 +0100
Subject: [PATCH] Add Google Dialer support jars

* Makes Google Dialer installable from Play Store
---
 common/Android.mk                             |  10 ++++++++++
 common/common-vendor.mk                       |   2 ++
 .../com.google.android.dialer.support.xml     |  11 +++++++++++
 .../com.google.android.dialer.support.jar     | Bin 0 -> 774 bytes
 .../framework/com.google.android.maps.jar     | Bin 177619 -> 177619 bytes
 proprietary-files-common.txt                  |   2 ++
 6 files changed, 25 insertions(+)
 create mode 100644 common/proprietary/etc/permissions/com.google.android.dialer.support.xml
 create mode 100644 common/proprietary/framework/com.google.android.dialer.support.jar

diff --git a/common/Android.mk b/common/Android.mk
index 0ebd264..3e974d4 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -135,6 +135,16 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := com.google.android.dialer.support
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/framework/com.google.android.dialer.support.jar
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := .jar
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := com.google.android.maps
 LOCAL_MODULE_OWNER := gapps
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index b993ad5..72c8f29 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -15,6 +15,7 @@
 # This file is generated by device/gapps//setup-makefiles.sh
 
 PRODUCT_COPY_FILES += \
+    vendor/gapps/common/proprietary/etc/permissions/com.google.android.dialer.support.xml:system/etc/permissions/com.google.android.dialer.support.xml \
     vendor/gapps/common/proprietary/etc/permissions/com.google.android.maps.xml:system/etc/permissions/com.google.android.maps.xml \
     vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google.xml:system/etc/permissions/privapp-permissions-google.xml \
     vendor/gapps/common/proprietary/etc/sysconfig/google.xml:system/etc/sysconfig/google.xml \
@@ -31,6 +32,7 @@ PRODUCT_PACKAGES += \
     GooglePartnerSetup \
     GoogleServicesFramework \
     Phonesky \
+    com.google.android.dialer.support \
     com.google.android.maps
 ifeq ($(TARGET_IS_GROUPER),)
 
diff --git a/common/proprietary/etc/permissions/com.google.android.dialer.support.xml b/common/proprietary/etc/permissions/com.google.android.dialer.support.xml
new file mode 100644
index 0000000..28ef29f
--- /dev/null
+++ b/common/proprietary/etc/permissions/com.google.android.dialer.support.xml
@@ -0,0 +1,11 @@
+<permissions>
+    <!-- Shared library required on the device to get Google Dialer updates from
+         Play Store. This will be deprecated once Google Dialer play store
+         updates stop supporting pre-O devices. -->
+    <library name="com.google.android.dialer.support"
+      file="/system/framework/com.google.android.dialer.support.jar" />
+
+    <!-- Starting from Android O and above, this system feature is required for
+         getting Google Dialer play store updates. -->
+    <feature name="com.google.android.apps.dialer.SUPPORTED" />
+</permissions>
diff --git a/common/proprietary/framework/com.google.android.dialer.support.jar b/common/proprietary/framework/com.google.android.dialer.support.jar
new file mode 100644
index 0000000000000000000000000000000000000000..568fdb2c0d55940321890b800be06a9637cd65e9
GIT binary patch
literal 774
zcmWIWW@Zs#VBp|jU|>+R01^yLAOZ+D8CV#6T|*poJ^kGD|D9rBU}gwFQ9NY_+g2Z-
zLSG;T8i7#k>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48B
zt5`TAUPvC9J>yl{v#CqOo~l06$oL_ys`h+|mc?^%(I?`n(-^*Hek%G{#0ayUfrDXv
zZm7>BJ=JO>Mg|4}pnJI)WEhfj5{rvdi}g}cD?&p!8JJ&X_C|qlX$3a}Bg;Ex1_qY*
zK*HN|?E@nNvs8}H!tYO52L?%hUb|syvEcTV`Oo{;>ddz)Vx1u&!6hLfp>@coMPk8%
z=827sa~YM+@f@*r;1Nlhaj=2GA(zK{!K3Jg8*C?bFfF;y@KIdh8S|&RjTTZJj~jM$
z2rgnzk>eIIHeA5urm{^zNZ#$b(V-tb2^+cGIxJb46y)TYXZxnbrFF_Sw^Y~FRr#&*
zPD}F33M|NUbgT>Pj0;PORBGPoUsSiQ&MG3x-cWz3hP|<?J?k33{Su1;<h#?d*%aj`
z)cu`vWKT)$|0Qd#q%4p~mS_&h%1iU~%$hjWDJ-dI+q%wq8wHuYJ>Aj_nc11G<&V7V
z<<$w7klb<c57VN=L>}(xavHqc*<nix(ww=n-B>xKMeg}<2^2d#JjWx--pb89g_qBm
z5h%JI80?HpBA^Jykw$<qj|5Os47yhI6ob&G3uMBzBBdXY33AM!)P*h9CEx}uX<Q9t
cqoe^=NE$$k{{U}RHjpl6AUp@8mB7gz0AIh>fdBvi

literal 0
HcmV?d00001

diff --git a/common/proprietary/framework/com.google.android.maps.jar b/common/proprietary/framework/com.google.android.maps.jar
index 122188c523ec40e3127f705c3bfb87b83aeea7fc..610537ffba1d83b71227a958a1bd21f3b4284033 100644
GIT binary patch
delta 51
zcmccon(Ojwt_kMM>vKaVS}C%>%Iu8-;>M)bB*v{tOk!I>64R@<GU+n|g{QCG%A^JW
DQ-Brt

delta 51
zcmccon(Ojwt_kMM3Y$YFS}C$?PwI&R;>M)bB*v{tOk!I>64R@<GU+n|g{QCG%A^JW
D70(l&

diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt
index 7e0e293..63eba7c 100644
--- a/proprietary-files-common.txt
+++ b/proprietary-files-common.txt
@@ -11,8 +11,10 @@
 -priv-app/Phonesky/Phonesky.apk;PRESIGNED
 
 -framework/com.google.android.maps.jar;PRESIGNED
+-framework/com.google.android.dialer.support.jar;PRESIGNED
 
 etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.android.dialer.support.xml
 etc/permissions/privapp-permissions-google.xml
 
 etc/sysconfig/google.xml