Merge pull request #30 from Grarak/cm-13.0

oneplus2: Add qcom telephony service
TheMuppets · Jun 12, 2016 · a74c762 · a74c762
2 parents 14cee47 + b5aac5e
commit a74c762
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 0 deletions.
diff --git a/oneplus2/Android.mk b/oneplus2/Android.mk
@@ -40,6 +40,16 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_CERTIFICATE := platform
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := QtiTelephonyService
+LOCAL_MODULE_OWNER := oneplus
+LOCAL_SRC_FILES := proprietary/app/QtiTelephonyService/QtiTelephonyService.apk
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := shutdownlistener
 LOCAL_MODULE_OWNER := oneplus

diff --git a/oneplus2/oneplus2-vendor-blobs.mk b/oneplus2/oneplus2-vendor-blobs.mk
@@ -392,10 +392,13 @@ PRODUCT_COPY_FILES += \
         vendor/oneplus/oneplus2/proprietary/bin/rmt_storage:/system/bin/rmt_storage \
         vendor/oneplus/oneplus2/proprietary/etc/permissions/qcnvitems.xml:/system/etc/permissions/qcnvitems.xml \
         vendor/oneplus/oneplus2/proprietary/etc/permissions/qcrilhook.xml:/system/etc/permissions/qcrilhook.xml \
+        vendor/oneplus/oneplus2/proprietary/framework/qti-telephony-common.jar:/system/framework/qti-telephony-common.jar \
+        vendor/oneplus/oneplus2/proprietary/framework/QtiTelephonyServicelibrary.jar:/system/framework/QtiTelephonyServicelibrary.jar \
         vendor/oneplus/oneplus2/proprietary/lib64/libparam.so:/system/lib64/libparam.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libconfigdb.so:/system/vendor/lib64/libconfigdb.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/liblqe.so:/system/vendor/lib64/liblqe.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libnetmgr.so:/system/vendor/lib64/libnetmgr.so \
+        vendor/oneplus/oneplus2/proprietary/vendor/lib64/librcc.so:/system/vendor/lib64/librcc.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libril-qc-qmi-1.so:/system/vendor/lib64/libril-qc-qmi-1.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libril-qc-radioconfig.so:/system/vendor/lib64/libril-qc-radioconfig.so \
         vendor/oneplus/oneplus2/proprietary/vendor/lib64/libril-qcril-hook-oem.so:/system/vendor/lib64/libril-qcril-hook-oem.so \

diff --git a/oneplus2/oneplus2-vendor.mk b/oneplus2/oneplus2-vendor.mk
@@ -22,6 +22,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     qcrilmsgtunnel \
+    QtiTelephonyService \
     shutdownlistener \
     TimeService
 

diff --git a/oneplus2/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk b/oneplus2/proprietary/app/QtiTelephonyService/QtiTelephonyService.apk
diff --git a/oneplus2/proprietary/framework/QtiTelephonyServicelibrary.jar b/oneplus2/proprietary/framework/QtiTelephonyServicelibrary.jar
diff --git a/oneplus2/proprietary/framework/qti-telephony-common.jar b/oneplus2/proprietary/framework/qti-telephony-common.jar
diff --git a/oneplus2/proprietary/vendor/lib64/librcc.so b/oneplus2/proprietary/vendor/lib64/librcc.so