sdm660-common: Update Blobs to LA.UM.8.2.r1-04000-sdm660.0

*DPM
*Radio
*QMI
*CNE
*Cleanup Makefiles

Android.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2019 The LineageOS Project
+# Copyright (C) 2018-2019 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter clover jasmine_sprout wayne,$(TARGET_DEVICE)),)
+ifneq ($(filter jasmine_sprout wayne clover,$(TARGET_DEVICE)),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libantradio
@@ -41,105 +41,6 @@ LOCAL_MODULE_SUFFIX := .so
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.quicinc.cne.api@1.0
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/lib64/com.quicinc.cne.api@1.0.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.quicinc.cne.api@1.1
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/lib64/com.quicinc.cne.api@1.1.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.quicinc.cne.constants@1.0
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/lib64/com.quicinc.cne.constants@1.0.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.quicinc.cne.constants@2.0
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/lib64/com.quicinc.cne.constants@2.0.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.quicinc.cne.constants@2.1
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/lib64/com.quicinc.cne.constants@2.1.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.quicinc.cne.server@2.0
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/lib64/com.quicinc.cne.server@2.0.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.quicinc.cne.server@2.1
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/lib64/com.quicinc.cne.server@2.1.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.quicinc.cne.server@2.2
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/lib64/com.quicinc.cne.server@2.2.so
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := QtiTelephonyService
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/app/QtiTelephonyService/QtiTelephonyService.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := SoterService
 LOCAL_MODULE_OWNER := xiaomi
@@ -151,40 +52,6 @@ LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := datastatusnotification
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/app/datastatusnotification/datastatusnotification.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := embms
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/app/embms/embms.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := CNEService
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/priv-app/CNEService/CNEService.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := HotwordEnrollmentOKGoogleWCD9340
 LOCAL_MODULE_OWNER := xiaomi
@@ -221,42 +88,6 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := ims
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/priv-app/ims/ims.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := qcrilmsgtunnel
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := imssettings
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/vendor/app/imssettings/imssettings.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := PowerOffAlarm
 LOCAL_MODULE_OWNER := xiaomi
@@ -281,6 +112,68 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := QtiTelephonyService
+LOCAL_MODULE_OWNER := xiaomi
+LOCAL_SRC_FILES := proprietary/product/app/QtiTelephonyService/QtiTelephonyService.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := datastatusnotification
+LOCAL_MODULE_OWNER := xiaomi
+LOCAL_SRC_FILES := proprietary/product/app/datastatusnotification/datastatusnotification.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := imssettings
+LOCAL_MODULE_OWNER := xiaomi
+LOCAL_SRC_FILES := proprietary/product/app/imssettings/imssettings.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ims
+LOCAL_MODULE_OWNER := xiaomi
+LOCAL_SRC_FILES := proprietary/product/priv-app/ims/ims.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := qcrilmsgtunnel
+LOCAL_MODULE_OWNER := xiaomi
+LOCAL_SRC_FILES := proprietary/product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := QPerformance
 LOCAL_MODULE_OWNER := xiaomi

BoardConfigVendor.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2019 The LineageOS Project
+# Copyright (C) 2018-2019 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

proprietary/etc/dpm/dpm.conf

@@ -1,61 +0,0 @@
-#configuration parameters for DPM Fast Dormancy and TCM module.
-
-#Configuration params for FD
-#delay_time while issuing dormancy_request
-dpm_fd_delay_time_timer_value:0
-#Idle timer value when SCREEN state is ON
-#dpm_fd_screen_on_idle_timer_value = actual_screen_on_timer + delay_time
-dpm_fd_screen_on_idle_timer_value:15
-#Idle timer value when SCREEN state is OFF
-#dpm_fd_screen_off_idle_timer_value = actual_screen_off_timer + delay_time
-dpm_fd_screen_off_idle_timer_value:3
-#Idle timer value when TETHERING is ON
-#This takes precedence over SCREEN state
-#dpm_tethering_on_idle_timer_value = actual_tethering_on_timer + delay_time
-dpm_fd_tethering_on_idle_timer_value:15
-#FastDormancy can be configured for a network type
-#Default configuration 101000011100001000
-dpm_fd_enable_networks_mask:0x28708
-
-#Configuration params for TCM
-#Idle timer value when SCREEN state is ON
-#min : 1s and max :256s
-dpm_tcm_screen_on_idle_timer_value:5
-#Idle timer value when SCREEN state is OFF
-#min : 2s and max :256s
-dpm_tcm_screen_off_idle_timer_value:2
-#TCM can be configured for a network type
-#Default configuration 11111111111111111110
-dpm_tcm_enable_networks_mask:0xFFFFE
-
-
-#FastDormancy and TCM can be configured for a network type
-#NETWORK_TYPE_UNKNOWN = 0
-#NETWORK_TYPE_GPRS = 1
-#NETWORK_TYPE_EDGE = 2
-#NETWORK_TYPE_UMTS = 3
-#NETWORK_TYPE_CDMA = 4
-#NETWORK_TYPE_EVDO_0 = 5
-#NETWORK_TYPE_EVDO_A = 6
-#NETWORK_TYPE_1xRTT = 7
-#NETWORK_TYPE_HSDPA = 8
-#NETWORK_TYPE_HSUPA = 9
-#NETWORK_TYPE_HSPA = 10
-#NETWORK_TYPE_IDEN = 11
-#NETWORK_TYPE_EVDO_B = 12
-#NETWORK_TYPE_LTE = 13
-#NETWORK_TYPE_EHRPD = 14
-#NETWORK_TYPE_HSPAP = 15
-#NETWORK_TYPE_GSM = 16
-#NETWORK_TYPE_TD_SCDMA = 17
-#NETWORK_TYPE_IWLAN = 18
-#NETWORK_TYPE_LTE_CA = 19;
-
-#configuration params for Dormancy manager
-#first larger inactivity soft timer to poll for dormancy in seconds.
-dpm_dm_t1_inactivity_timer:15
-#second smaller inactivity soft timer to poll for dormancy in seconds.
-dpm_dm_t2_inactivity_timer:5
-#number of times T2 can be repeated before registering for dormancy indication with modem directly.
-dpm_dm_repeat_t2:5
-

proprietary/etc/init/dpmd.rc

@@ -1,17 +0,0 @@
-# Copyright (c) 2018 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-# Create the directories used by DPM subsystem
-
-on post-fs-data
-    mkdir /data/dpm 0771 system system
-    chown system system /data/dpm
-
-#start dpmd service
-service dpmd /system/bin/dpmd
-    class late_start
-    socket dpmd stream 660 root system
-    socket tcm  stream 660 root inet
-    socket dpmwrapper stream 660 root inet
-    group system readproc inet radio wakelock oem_2901

proprietary/etc/permissions/cneapiclient.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2011-2013 Qualcomm Technologies, Inc.  All Rights Reserved. Qualcomm Technologies Proprietary and Confidential.-->
-<permissions>
-    <library name="com.quicinc.cneapiclient"
-        file="/system/framework/cneapiclient.jar"/>
-</permissions>

proprietary/etc/permissions/com.qti.dpmframework.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2015-2016 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.-->
-<permissions>
-    <library name="com.qti.dpmframework"
-        file="/system/framework/com.qti.dpmframework.jar"/>
-    <permission name="com.qualcomm.permission.READPROC" >
-    <group gid="readproc" />
-    </permission>
-</permissions>

proprietary/etc/permissions/com.quicinc.cne.xml

@@ -1,8 +0,0 @@
-<!--
-   Copyright (c) 2015 Qualcomm Technologies, Inc.
-   All Rights Reserved.
-   Qualcomm Technologies Proprietary and Confidential.
--->
-<permissions>
-   <library name="com.quicinc.cne" file="/system/framework/com.quicinc.cne.jar"/>
-</permissions>

proprietary/etc/permissions/dpmapi.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2014 Qualcomm Technologies, Inc.  All Rights Reserved. Qualcomm Technologies Proprietary and Confidential.-->
-<permissions>
-    <library name="com.qti.dpmapi"
-        file="/system/framework/dpmapi.jar"/>
-</permissions>

proprietary/etc/permissions/embms.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
- <library name="com.qualcomm.embmslibrary"
-          file="/system/framework/embmslibrary.jar"/>
-</permissions>

proprietary/etc/permissions/qcrilhook.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
- <library name="com.qualcomm.qcrilhook"
-          file="/system/framework/qcrilhook.jar"/>
-</permissions>

proprietary/etc/permissions/qti_libpermissions.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-    Copyright (c) 2017 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
- -->
-<permissions>
-    <library name="android.hidl.manager@1.0-java"
-          file="/system/framework/android.hidl.manager-V1.0-java.jar"/>
-</permissions>

proprietary/etc/permissions/qti_permissions.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  Copyright (c) 2016 Qualcomm Technologies, Inc.  All Rights Reserved.
-  Qualcomm Technologies Proprietary and Confidential.
--->
-<permissions>
-    <permission name="com.qti.permission.DIAG">
-        <group gid="oem_2901" />
-    </permission>
-    <permission name="com.qti.permission.AUDIO">
-        <group gid="audio" />
-    </permission>
-</permissions>
-

proprietary/product/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml

@@ -6,5 +6,5 @@
 -->
 <permissions>
     <library name="com.qualcomm.qti.imscmservice-V2.0-java"
-            file="/system/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar" />
+            file="/system/product/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar" />
 </permissions>

proprietary/product/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml

@@ -6,6 +6,6 @@
 
 <permissions>
 
-    <library name="com.qualcomm.qti.imscmservice-V2.1-java" file="/system/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar" />
+    <library name="com.qualcomm.qti.imscmservice-V2.1-java" file="/system/product/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar" />
 
 </permissions>

proprietary/product/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright (c) 2019 Qualcomm Technologies, Inc.
+     All Rights Reserved.
+     Confidential and Proprietary - Qualcomm Technologies, Inc. -->
+
+<permissions>
+
+    <library name="com.qualcomm.qti.imscmservice-V2.2-java" file="/system/product/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar" />
+
+</permissions>

proprietary/product/etc/permissions/qcrilhook.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+ <library name="com.qualcomm.qcrilhook"
+          file="/product/framework/qcrilhook.jar"
+          dependency="qti-telephony-utils:qti-telephony-hidl-wrapper" />
+</permissions>

proprietary/product/etc/permissions/telephonyservice.xml

@@ -7,5 +7,5 @@ Qualcomm Technologies Proprietary and Confidential.
 
 <permissions>
 <library name="com.qualcomm.qti.QtiTelephonyServicelibrary"
-         file="/system/framework/QtiTelephonyServicelibrary.jar"/>
+         file="/system/product/framework/QtiTelephonyServicelibrary.jar"/>
 </permissions>

proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2018-2019 Qualcomm Technologies, Inc.
+    All Rights Reserved.
+    Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+<permissions>
+    <library name="vendor.qti.hardware.data.connection-V1.0-java"
+            file="/system/product/framework/vendor.qti.hardware.data.connection-V1.0-java.jar" />
+</permissions>

proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2019 Qualcomm Technologies, Inc.
+    All Rights Reserved.
+    Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+<permissions>
+    <library name="vendor.qti.hardware.data.connection-V1.1-java"
+            file="/system/product/framework/vendor.qti.hardware.data.connection-V1.1-java.jar" />
+</permissions>