klee: Update vendor blobs to OS.3.0.304.WPJMIXM

Signed-off-by: kylieeXD <khayloaftck@gmail.com>

Android.bp

@@ -191,7 +191,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "android.hardware.security.keymint-V3-ndk-v36",
+    name: "android.hardware.security.keymint-V3-ndk-v34",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -199,7 +199,7 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v36.so",
+                "proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v34.so",
             ],
             shared_libs: [
                 "libbinder_ndk",
@@ -27927,6 +27927,31 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.mediatek.hardware.audio-V1-ndk",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.mediatek.hardware.audio-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.mediatek.hardware.bluetooth.audio-V1-ndk",
     owner: "xiaomi",
@@ -27955,6 +27980,67 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.mediatek.hardware.bluetooth.audio@2.1",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so",
+            ],
+            shared_libs: [
+                "android.hardware.audio.common@5.0",
+                "android.hidl.safe_union@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.mediatek.hardware.bluetooth.audio@2.2",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.2.so",
+            ],
+            shared_libs: [
+                "android.hardware.audio.common@5.0",
+                "vendor.mediatek.hardware.bluetooth.audio@2.1",
+                "android.hidl.safe_union@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.mediatek.hardware.camera.aovservice-V3-ndk",
     owner: "xiaomi",
@@ -36205,7 +36291,7 @@ cc_prebuilt_library_shared {
                 "libkeymint",
                 "libkeymint_support",
                 "libkeymint_remote_prov_support",
-                "android.hardware.security.keymint-V3-ndk-v36",
+                "android.hardware.security.keymint-V3-ndk-v34",
                 "android.hardware.secure_element-V1-ndk",
                 "libc++",
                 "libc",
@@ -37067,7 +37153,7 @@ cc_prebuilt_library_shared {
                 "libkeymint",
                 "libkeymaster_messages",
                 "libkeymint_support",
-                "android.hardware.security.keymint-V3-ndk-v36",
+                "android.hardware.security.keymint-V3-ndk-v34",
                 "libkeymint_remote_prov_support",
                 "libmisight",
                 "libc++",
@@ -38717,7 +38803,7 @@ cc_prebuilt_binary {
                 "proprietary/vendor/bin/hw/android.hardware.security.keymint@3.0-service.mitee",
             ],
             shared_libs: [
-                "android.hardware.security.keymint-V3-ndk-v36",
+                "android.hardware.security.keymint-V3-ndk-v34",
                 "libteecli",
                 "libhidlbase",
                 "android.hardware.security.rkp-V3-ndk",

Android.mk

@@ -6,27 +6,27 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),klee)
 
-$(call add-radio-file-sha1-checked,radio/apusys.img,755af7a320d699dcc47a54809eec07aec1c12843)
-$(call add-radio-file-sha1-checked,radio/audio_dsp.img,abe6d4cf5c2645ac2beea554011cc9b09f19bc9b)
-$(call add-radio-file-sha1-checked,radio/ccu.img,af39aa43e20550ea5f9e3bc2152d7bd4dbe453e0)
-$(call add-radio-file-sha1-checked,radio/connsys_bt.img,317d878298ba30097ec79285de26adcdee9ae566)
-$(call add-radio-file-sha1-checked,radio/connsys_gnss.img,f10db26f71708b713c9dda19c635346ca3a860f2)
-$(call add-radio-file-sha1-checked,radio/connsys_wifi.img,d378fe38be231ef44ffcad095f0e453e9d2a7508)
-$(call add-radio-file-sha1-checked,radio/dpm.img,f317d85526a0d49fb0728391d2548378dfbe595f)
-$(call add-radio-file-sha1-checked,radio/gpueb.img,319940a4cbabbf9fc1fb356135c1298a239b161a)
-$(call add-radio-file-sha1-checked,radio/gz.img,d69ae21be01a51e88b9aa5115b21e98d45897d5b)
-$(call add-radio-file-sha1-checked,radio/lk.img,8daa12bb697144e3e08e5af9cb29f94e66b174af)
-$(call add-radio-file-sha1-checked,radio/logo.img,63488a491f97d9136b2ed992377ff67d3916eb61)
-$(call add-radio-file-sha1-checked,radio/mcf_ota.img,feffb2d9c5624bce6050374182503d779c5fc7f0)
-$(call add-radio-file-sha1-checked,radio/mcupm.img,75409a02f228964afdc46a4d7d185bb0c03ef20e)
-$(call add-radio-file-sha1-checked,radio/modem.img,447bb9d261509fcecfd87aa5e3961d8860b6921f)
-$(call add-radio-file-sha1-checked,radio/mvpu_algo.img,1cf17656259866bef066266f313af938c2bf4a86)
-$(call add-radio-file-sha1-checked,radio/pi_img.img,ae34791e460b83c61e87cff42a61b6e273adbdcb)
+$(call add-radio-file-sha1-checked,radio/apusys.img,b5dc6d7ca829a5f695e5e93bf7c42920adf38a63)
+$(call add-radio-file-sha1-checked,radio/audio_dsp.img,84cace8a957e6f31f98c810a5638882a101d063b)
+$(call add-radio-file-sha1-checked,radio/ccu.img,03a4477801013d067162acf75311aca042830343)
+$(call add-radio-file-sha1-checked,radio/connsys_bt.img,07cb90922b1267017c81f6a16cc5210a4b8b4114)
+$(call add-radio-file-sha1-checked,radio/connsys_gnss.img,e3d7da7138e0a80401ba0e8cb2061fe60d72f294)
+$(call add-radio-file-sha1-checked,radio/connsys_wifi.img,8b9a7baf2541be6637da550ecc4f26b6fe3d64a6)
+$(call add-radio-file-sha1-checked,radio/dpm.img,7cbb75a4fe46d93b4f37ea486c2ca672080956ce)
+$(call add-radio-file-sha1-checked,radio/gpueb.img,c6768caf48850468e44ac5178a0a453fad7b4047)
+$(call add-radio-file-sha1-checked,radio/gz.img,87fa615c7586c56251689b86c6cbf4d736e90680)
+$(call add-radio-file-sha1-checked,radio/lk.img,5bb2e57636d0ac263dc29a73740dee82473825ce)
+$(call add-radio-file-sha1-checked,radio/logo.img,30ae0231b348a78c8bb9ae9c08d7aae48ca65685)
+$(call add-radio-file-sha1-checked,radio/mcf_ota.img,e421d5b21b9cc20de71de1ccfb8174224e901e27)
+$(call add-radio-file-sha1-checked,radio/mcupm.img,86e34add1842a12d8696f8c57c5c849ec9b584ec)
+$(call add-radio-file-sha1-checked,radio/modem.img,dd6afd4cc55310fd5aa47db920b675dd6dfb4364)
+$(call add-radio-file-sha1-checked,radio/mvpu_algo.img,5b66a20087a3fcc981a96e9e8637adf1d01d4ad0)
+$(call add-radio-file-sha1-checked,radio/pi_img.img,188ba95222bad7e0e0d8e8c7966937c762dc55a9)
 $(call add-radio-file-sha1-checked,radio/preloader_raw.img,58b36a1e257e4e4362b39b825ab673f1c9dd77fd)
-$(call add-radio-file-sha1-checked,radio/scp.img,7cf6d1221812f19010018a9f7b0fa87ea01e2af8)
-$(call add-radio-file-sha1-checked,radio/spmfw.img,274e5e9063e46df30d8d87e961da8ef6a567106a)
-$(call add-radio-file-sha1-checked,radio/sspm.img,0b0366b959cea1986276e62ed8f70f8149db2055)
-$(call add-radio-file-sha1-checked,radio/tee.img,df9ebf5b0e4936b6f1884e8a07f42790b508a620)
-$(call add-radio-file-sha1-checked,radio/vcp.img,cfcf8aa4ddacd2780022c2c03f51fa5f5f01a821)
+$(call add-radio-file-sha1-checked,radio/scp.img,d8c975547e39141c4b5cf268fc3b37d9f99ba47d)
+$(call add-radio-file-sha1-checked,radio/spmfw.img,3ca3aeb80ffd268340096001b7a37e666e500126)
+$(call add-radio-file-sha1-checked,radio/sspm.img,628ef8f22d7840764230a147e512b2a7fbd94423)
+$(call add-radio-file-sha1-checked,radio/tee.img,8312174f4ab144eefe46ed91d3ea40d5b31497e0)
+$(call add-radio-file-sha1-checked,radio/vcp.img,b0871ae374a08fd2c1f8ad745129aa6f1b9623de)
 
 endif

klee-vendor.mk

@@ -737,6 +737,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/klee/proprietary/vendor/etc/nnapi_powerhal.json:$(TARGET_COPY_OUT_VENDOR)/etc/nnapi_powerhal.json \
     vendor/xiaomi/klee/proprietary/vendor/etc/p10_36_02_0a_dsc_vdo_dbi.bin:$(TARGET_COPY_OUT_VENDOR)/etc/p10_36_02_0a_dsc_vdo_dbi.bin \
     vendor/xiaomi/klee/proprietary/vendor/etc/p10_42_02_0b_dsc_vdo_dbi.bin:$(TARGET_COPY_OUT_VENDOR)/etc/p10_42_02_0b_dsc_vdo_dbi.bin \
+    vendor/xiaomi/klee/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hardware_keystore.mitee.xml \
     vendor/xiaomi/klee/proprietary/vendor/etc/permissions/android.hardware.identity_credential.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.identity_credential.mitee.xml \
     vendor/xiaomi/klee/proprietary/vendor/etc/permissions/camera_extensions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/camera_extensions.xml \
     vendor/xiaomi/klee/proprietary/vendor/etc/pq_flag.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pq_flag.xml \
@@ -1116,7 +1117,7 @@ PRODUCT_PACKAGES += \
     APUWareUtilsAidlServer \
     android.hardware.audio.core-impl-mediatek \
     android.hardware.bluetooth.audio-impl-mediatek \
-    android.hardware.security.keymint-V3-ndk-v36 \
+    android.hardware.security.keymint-V3-ndk-v34 \
     com.xiaomi.camdfx \
     com.xiaomi.camhal.extmodel.ec_executor \
     com.xiaomi.camhal.extmodel.intent_aware_sys \
@@ -1953,7 +1954,10 @@ PRODUCT_PACKAGES += \
     vendor.mediatek.hardware.apuware.apusys-V5-ndk-vendor \
     vendor.mediatek.hardware.apuware.utils-V1-ndk-vendor \
     vendor.mediatek.hardware.apuware.utils@2.0-vendor \
+    vendor.mediatek.hardware.audio-V1-ndk \
     vendor.mediatek.hardware.bluetooth.audio-V1-ndk \
+    vendor.mediatek.hardware.bluetooth.audio@2.1 \
+    vendor.mediatek.hardware.bluetooth.audio@2.2 \
     vendor.mediatek.hardware.camera.aovservice-V3-ndk \
     vendor.mediatek.hardware.camera.atms-V1-ndk \
     vendor.mediatek.hardware.camera.atms@1.0 \

proprietary/odm/etc/camera/cameraopt_reclaim.json

@@ -6,8 +6,7 @@
             "dynamic_task_proctect_support": true,
             "blackList_mem_limit_support" : true,
             "deep_kill_support": false,
-            "support_force_page_out": true,
-            "gps_protect_list_support": true
+            "support_force_page_out": true
         },
         "threshold": {
             "skip_task": 4,
@@ -32,46 +31,37 @@
                 "name": "kill_policy",
                 "config": {
                     "oom_level": {
-                        "1536000": 51,
-                        "1843200": 101,
-                        "2048000": 251,
-                        "2252800": 700,
-                        "2560000": 702
+                        "51200": 0,
+                        "89600": 100,
+                        "128000": 200,
+                        "154200": 251,
+                        "200000": 700,
+                        "262144": 702,
+                        "393216": 800
                     },
                     "free_mem": {
-                        "102400": 251,
-                        "153600": 702,
-                        "204800": 800
+                        "12800": 702,
+                        "20480": 800,
+                        "32000": 900
                     },
                     "some_psi": {
                         "99": 50,
                         "40": 51,
-                        "26": 101,
-                        "20": 251,
-                        "18": 701,
-                        "16": 702,
-                        "12": 800,
-                        "8": 905,
-                        "5": 925
+                        "30": 101,
+                        "25": 251,
+                        "20": 701,
+                        "18": 702,
+                        "16": 800,
+                        "12": 905,
+                        "10": 925
                     },
                     "deepkill_policy" : {
-                        "251": 4,
+                        "200": 4,
                         "101": 8,
-                        "51": 16
+                        "51": 16,
+                        "50": 32
                     }
                 }
-            },
-            {
-                "name":"rekill_policy",
-                "config" : {
-                    "max_kill_count": 3,
-                    "killed_benifit_threshold": 153600,
-                    "lowadj_killed_benifit_threshold": 307200,
-                    "lowadj_interval_ms" : 60000,
-                    "reset_interval_ms" : 120000,
-                    "policy_change_psi": 20,
-                    "lowadj" : 250
-                }
             }
         ],
         "configs": [
@@ -185,26 +175,6 @@
                     "com.xiaomi.smarthome",
                     "client.pid"
                 ]
-            },
-            {
-                "name": "gps_protect_list",
-                "config": [
-                    "com.autonavi.minimap",
-                    "com.baidu.BaiduMap",
-                    "com.tencent.map",
-                    "com.google.android.apps.maps",
-                    "ru.yandex.yandexmaps",
-                    "com.waze",
-                    "com.google.earth",
-                    "com.strava",
-                    "de.komoot.android",
-                    "com.mapswithme.maps.pro",
-                    "ru.dublgis.dgismobile",
-                    "com.google.android.apps.mapslite",
-                    "com.huawei.maps.app",
-                    "com.sygic.aura",
-                    "com.alltrails.alltrails"
-                ]
             }
         ],
         "ReclaimActions": {

proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<permissions>
+  <feature name="android.hardware.hardware_keystore" version="300" />
+</permissions>