Snap for 6862191 from 0497ed9eacb45ed54dcfbbce13de5c25668e5622 to rvc-qpr1-release
Change-Id: I29d3f5ed750803951e3be2167af4a8dadd1fa1d3
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 05cdc60..4b9737b 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -718,6 +718,9 @@
// Dump camera profiler log
RunCommandToFd(fd, "Camera Profiler Logs", {"/vendor/bin/sh", "-c", "for f in /data/vendor/camera/profiler/camx_*; do echo [$f]; cat \"$f\";done"});
+ // Dump fastrpc dma buffer size
+ DumpFileToFd(fd, "Fastrpc dma buffer", "/sys/kernel/fastrpc/total_dma_kb");
+
if (modemThreadHandle) {
pthread_join(modemThreadHandle, NULL);
}
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 0f30a0e..5bcef9e 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -7,6 +7,7 @@
;;
qcom)
TO_EXTRACT="\
+ system_ext/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml \
system_ext/etc/permissions/org_codeaurora_ims.xml \
system_ext/etc/permissions/qcrilhook.xml \
system_ext/etc/permissions/telephonyservice.xml \
@@ -49,5 +50,6 @@
system_ext/lib/libvr_object_engine.so \
system_ext/app/QtiTelephonyService/QtiTelephonyService.apk \
system_ext/priv-app/ims/ims.apk \
+ system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk \
"
;;
diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk
index 88612b1..8d0a9ea 100644
--- a/self-extractors/qcom/staging/Android.mk
+++ b/self-extractors/qcom/staging/Android.mk
@@ -7,6 +7,20 @@
LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_OWNER := qcom
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := qcrilmsgtunnel
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := qcom
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 8bb03f5..1677e71 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -18,6 +18,7 @@
# AOSP packages required by the blobs
PRODUCT_PACKAGES := \
ims \
+ qcrilmsgtunnel \
QtiTelephonyService
PRODUCT_PACKAGES += \
@@ -33,6 +34,7 @@
# blob(s) necessary for bramble hardware
PRODUCT_COPY_FILES := \
+ vendor/qcom/bramble/proprietary/com.qualcomm.qcrilmsgtunnel.xml:system_ext/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml \
vendor/qcom/bramble/proprietary/org_codeaurora_ims.xml:system_ext/etc/permissions/org_codeaurora_ims.xml \
vendor/qcom/bramble/proprietary/qcrilhook.xml:system_ext/etc/permissions/qcrilhook.xml \
vendor/qcom/bramble/proprietary/telephonyservice.xml:system_ext/etc/permissions/telephonyservice.xml \
