diff --git a/common.mk b/common.mk index cc8beb8..8c60af6 100644 --- a/common.mk +++ b/common.mk @@ -199,10 +199,8 @@ PRODUCT_ENABLE_UFFD_GC := false # Media PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/blair/media_codecs_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_blair.xml \ $(LOCAL_PATH)/media/blair/media_codecs_performance_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_blair.xml \ $(LOCAL_PATH)/media/blair/media_profiles_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_blair.xml \ - $(LOCAL_PATH)/media/holi/media_codecs_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_holi.xml \ $(LOCAL_PATH)/media/holi/media_codecs_performance_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_holi.xml \ $(LOCAL_PATH)/media/holi/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_holi.xml \ $(LOCAL_PATH)/media/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ diff --git a/ims-patches/0001-ImsConfigImpl-Return-0-in-getWfcMDN-in-any-case.patch b/ims-patches/0001-ImsConfigImpl-Return-0-in-getWfcMDN-in-any-case.patch index 46eecd5..dcd45db 100644 --- a/ims-patches/0001-ImsConfigImpl-Return-0-in-getWfcMDN-in-any-case.patch +++ b/ims-patches/0001-ImsConfigImpl-Return-0-in-getWfcMDN-in-any-case.patch @@ -1,20 +1,20 @@ -From 0f3f402c9718d24a66d3a59b36c167de848fcff9 Mon Sep 17 00:00:00 2001 +From 6f37560d2158cb669e4153df119d0447f8f708e4 Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Sun, 26 Jan 2020 20:23:44 +0330 -Subject: [PATCH 1/5] ImsConfigImpl: Return 0 in getWfcMDN in any case +Subject: [PATCH 1/4] ImsConfigImpl: Return 0 in getWfcMDN in any case --- smali/org/codeaurora/ims/ImsConfigImpl.smali | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/smali/org/codeaurora/ims/ImsConfigImpl.smali b/smali/org/codeaurora/ims/ImsConfigImpl.smali -index 644a553..c921038 100644 +index f81bc1d..ba4cbfd 100644 --- a/smali/org/codeaurora/ims/ImsConfigImpl.smali +++ b/smali/org/codeaurora/ims/ImsConfigImpl.smali -@@ -1471,22 +1471,9 @@ +@@ -1493,22 +1493,9 @@ .param p1, "subid" # I - .line 849 + .line 852 - const-string v0, "wfc_ims_mdn" - - iget-object v1, p0, Lorg/codeaurora/ims/ImsConfigImpl;->mContext:Landroid/content/Context; @@ -23,17 +23,17 @@ index 644a553..c921038 100644 - - move-result-object v0 - -- .line 851 +- .line 854 - .local v0, "mdn":Ljava/lang/String; - if-nez v0, :cond_0 const-string v0, "0" -- .line 852 +- .line 855 - :cond_0 return-object v0 .end method -- -2.43.0 +2.49.0 diff --git a/ims-patches/0002-ImsConfigImpl-don-t-call-setSubscriptionProperty-for.patch b/ims-patches/0002-ImsConfigImpl-don-t-call-setSubscriptionProperty-for.patch index 4496855..877d4fa 100644 --- a/ims-patches/0002-ImsConfigImpl-don-t-call-setSubscriptionProperty-for.patch +++ b/ims-patches/0002-ImsConfigImpl-don-t-call-setSubscriptionProperty-for.patch @@ -1,7 +1,7 @@ -From 9f41786278a80f4e8f8629ae13b1d5cc38c85fde Mon Sep 17 00:00:00 2001 +From 643f28a39a72c0b69d7f1d12d96296e253b48b2c Mon Sep 17 00:00:00 2001 From: Vachounet Date: Wed, 27 Jan 2021 23:28:48 +0100 -Subject: [PATCH 2/5] ImsConfigImpl: don't call setSubscriptionProperty for +Subject: [PATCH 2/4] ImsConfigImpl: don't call setSubscriptionProperty for wfc_ims_mdn --- @@ -9,16 +9,16 @@ Subject: [PATCH 2/5] ImsConfigImpl: don't call setSubscriptionProperty for 1 file changed, 70 deletions(-) diff --git a/smali/org/codeaurora/ims/ImsConfigImpl.smali b/smali/org/codeaurora/ims/ImsConfigImpl.smali -index c921038..c38fe20 100644 +index ba4cbfd..14d5a35 100644 --- a/smali/org/codeaurora/ims/ImsConfigImpl.smali +++ b/smali/org/codeaurora/ims/ImsConfigImpl.smali -@@ -3070,76 +3070,6 @@ +@@ -3096,76 +3096,6 @@ - .line 790 + .line 793 :cond_2 - if-ne p1, v2, :cond_3 - -- .line 791 +- .line 794 - new-instance v0, Ljava/lang/StringBuilder; - - invoke-direct {v0}, Ljava/lang/StringBuilder;->()V @@ -43,7 +43,7 @@ index c921038..c38fe20 100644 - - invoke-static {p0, v0}, Lcom/qualcomm/ims/utils/Log;->i(Ljava/lang/Object;Ljava/lang/String;)V - -- .line 795 +- .line 798 - :try_start_0 - iget v0, p0, Lorg/codeaurora/ims/ImsConfigImpl;->mSubId:I - @@ -53,14 +53,14 @@ index c921038..c38fe20 100644 - :try_end_0 - .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 - -- .line 799 +- .line 802 - goto :goto_1 - -- .line 797 +- .line 800 - :catch_0 - move-exception v0 - -- .line 798 +- .line 801 - .local v0, "e":Ljava/lang/Exception; - new-instance v1, Ljava/lang/StringBuilder; - @@ -82,13 +82,13 @@ index c921038..c38fe20 100644 - - invoke-static {p0, v1}, Lcom/qualcomm/ims/utils/Log;->e(Ljava/lang/Object;Ljava/lang/String;)V - -- .line 803 +- .line 806 - .end local v0 # "e":Ljava/lang/Exception; - :cond_3 - :goto_1 - const/16 v3, 0x2c + const/4 v6, 0x0 - const/4 v5, 0x1 + const/4 v7, 0x0 -- -2.43.0 +2.49.0 diff --git a/ims-patches/0003-ims-remove-uses-library-for-moto-ims-ext.patch b/ims-patches/0003-ims-remove-uses-library-for-moto-ims-ext.patch index 2111514..104de78 100644 --- a/ims-patches/0003-ims-remove-uses-library-for-moto-ims-ext.patch +++ b/ims-patches/0003-ims-remove-uses-library-for-moto-ims-ext.patch @@ -1,7 +1,7 @@ -From 4dd42142e2fbb2afd60ca6d8b4ac497c8d978f74 Mon Sep 17 00:00:00 2001 +From 3882ef22cf0d1db3c4bdd1e88b2ecc1c0ffa0787 Mon Sep 17 00:00:00 2001 From: Andrew Hexen Date: Thu, 25 May 2023 11:51:44 -0700 -Subject: [PATCH 3/5] ims: remove uses-library for moto-ims-ext +Subject: [PATCH 3/4] ims: remove uses-library for moto-ims-ext * This was added in 13 which breaks ims: 'java.lang.ClassNotFoundException org/codeaurora/ims/utils/QtiCarrierConfigHelper/ImsService.java' @@ -13,10 +13,10 @@ Signed-off-by: Andrew Hexen 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 3b3dc51..6f4b3de 100644 +index 894956d..e7fba97 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml -@@ -48,9 +48,8 @@ +@@ -51,9 +51,8 @@ @@ -29,5 +29,5 @@ index 3b3dc51..6f4b3de 100644 \ No newline at end of file + -- -2.43.0 +2.49.0 diff --git a/ims-patches/0004-ims-globally-set-RECEIVER_EXPORTED-for-registerRecei.patch b/ims-patches/0004-ims-globally-set-RECEIVER_EXPORTED-for-registerRecei.patch index dfd70cd..659855b 100644 --- a/ims-patches/0004-ims-globally-set-RECEIVER_EXPORTED-for-registerRecei.patch +++ b/ims-patches/0004-ims-globally-set-RECEIVER_EXPORTED-for-registerRecei.patch @@ -1,105 +1,136 @@ -From 74cc53ffea595daf25e176fb1783641994fb794d Mon Sep 17 00:00:00 2001 +From 5b369fc49fcf5e5005974a408c02faf79222e2b9 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Wed, 21 Feb 2024 19:18:49 +0100 -Subject: [PATCH 4/5] ims: globally set RECEIVER_EXPORTED for registerReceiver +Subject: [PATCH 4/4] ims: globally set RECEIVER_EXPORTED for registerReceiver E AndroidRuntime: FATAL EXCEPTION: main E AndroidRuntime: Process: org.codeaurora.ims, PID: 3692 E AndroidRuntime: java.lang.RuntimeException: Unable to create service org.codeaurora.ims.ImsService: java.lang.SecurityException: org.codeaurora.ims: One of RECEIVER_EXPORTED or RECEIVER_NOT_EXPORTED should be specified when a receiver isn't being registered exclusively for system broadcasts + +Co-authored-by: Cosmin Tanislav --- - smali/com/qualcomm/ims/vt/LowBatteryHandler.smali | 4 +++- - smali/org/codeaurora/ims/ImsCallModification.smali | 4 +++- - smali/org/codeaurora/ims/ImsConfigImpl.smali | 4 +++- - smali/org/codeaurora/ims/ImsServiceSub.smali | 4 +++- - smali/org/codeaurora/ims/ImsSubController.smali | 8 ++++++-- - 5 files changed, 18 insertions(+), 6 deletions(-) + smali/com/qualcomm/ims/vt/LowBatteryHandler.smali | 6 ++++-- + smali/org/codeaurora/ims/ImsCallModification.smali | 6 ++++-- + smali/org/codeaurora/ims/ImsServiceSub.smali | 6 ++++-- + smali/org/codeaurora/ims/ImsSubController.smali | 12 ++++++++---- + 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali b/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali -index d69a656..deff6db 100644 +index 8d8c7f9..ee8ec8a 100644 --- a/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali +++ b/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali -@@ -150,7 +150,9 @@ +@@ -101,7 +101,7 @@ + .end method - invoke-direct {v1, v2}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V + .method private constructor (Ljava/util/List;Landroid/content/Context;)V +- .locals 4 ++ .locals 5 + .param p2, "context" # Landroid/content/Context; + .annotation system Ldalvik/annotation/Signature; + value = { +@@ -154,7 +154,9 @@ -- invoke-virtual {p2, v0, v1}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent; -+ const/4 v2, 0x2 + invoke-direct {v2, v3}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V + +- invoke-virtual {v0, v1, v2}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent; ++ const/4 v4, 0x2 + -+ invoke-virtual {p2, v0, v1, v2}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; ++ invoke-virtual {v0, v1, v2, v4}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; .line 49 return-void diff --git a/smali/org/codeaurora/ims/ImsCallModification.smali b/smali/org/codeaurora/ims/ImsCallModification.smali -index 3c209df..a18213b 100644 +index ce51441..cbd8770 100644 --- a/smali/org/codeaurora/ims/ImsCallModification.smali +++ b/smali/org/codeaurora/ims/ImsCallModification.smali -@@ -300,7 +300,9 @@ - .line 140 - iget-object v2, p0, Lorg/codeaurora/ims/ImsCallModification;->mContext:Landroid/content/Context; +@@ -179,7 +179,7 @@ + .end method -- invoke-virtual {v2, v0, v1}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent; -+ const/4 v3, 0x2 -+ -+ invoke-virtual {v2, v0, v1, v3}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; + .method public constructor (Lorg/codeaurora/ims/ImsCallSessionImpl;Landroid/content/Context;Lorg/codeaurora/ims/ImsSenderRxr;Landroid/os/Looper;)V +- .locals 3 ++ .locals 4 + .param p1, "imsCallSessionImpl" # Lorg/codeaurora/ims/ImsCallSessionImpl; + .param p2, "context" # Landroid/content/Context; + .param p3, "senderRxr" # Lorg/codeaurora/ims/ImsSenderRxr; +@@ -304,7 +304,9 @@ - .line 141 - const-string v0, "Registering car mode receiver" -diff --git a/smali/org/codeaurora/ims/ImsConfigImpl.smali b/smali/org/codeaurora/ims/ImsConfigImpl.smali -index c38fe20..4daeb74 100644 ---- a/smali/org/codeaurora/ims/ImsConfigImpl.smali -+++ b/smali/org/codeaurora/ims/ImsConfigImpl.smali -@@ -668,7 +668,9 @@ - - iget-object v2, p0, Lorg/codeaurora/ims/ImsConfigImpl;->mBroadcastReceiver:Landroid/content/BroadcastReceiver; + iget-object v2, p0, Lorg/codeaurora/ims/ImsCallModification;->mBroadcastReceiver:Landroid/content/BroadcastReceiver; - invoke-virtual {v1, v2, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent; + const/4 v3, 0x2 + + invoke-virtual {v1, v2, v0, v3}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; - .line 257 - new-instance v1, Landroid/os/HandlerThread; + .line 141 + const-string v1, "Registering car mode receiver" diff --git a/smali/org/codeaurora/ims/ImsServiceSub.smali b/smali/org/codeaurora/ims/ImsServiceSub.smali -index 4a4a489..579abd8 100644 +index 9733735..8cdd5b6 100644 --- a/smali/org/codeaurora/ims/ImsServiceSub.smali +++ b/smali/org/codeaurora/ims/ImsServiceSub.smali +@@ -622,7 +622,7 @@ + .end method + + .method public constructor (Landroid/content/Context;ILorg/codeaurora/ims/ImsSenderRxr;Lorg/codeaurora/ims/ImsSubController;)V +- .locals 5 ++ .locals 6 + .param p1, "context" # Landroid/content/Context; + .param p2, "phoneId" # I + .param p3, "senderRxr" # Lorg/codeaurora/ims/ImsSenderRxr; @@ -1074,7 +1074,9 @@ iget-object v3, p0, Lorg/codeaurora/ims/ImsServiceSub;->mImsServiceStateReceiver:Lorg/codeaurora/ims/ImsServiceStateReceiver; - invoke-virtual {v2, v3, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent; -+ const/4 v4, 0x2 ++ const/4 v5, 0x2 + -+ invoke-virtual {v2, v3, v0, v4}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; ++ invoke-virtual {v2, v3, v0, v5}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; .line 312 iget-object v2, p0, Lorg/codeaurora/ims/ImsServiceSub;->mImsServiceStateReceiver:Lorg/codeaurora/ims/ImsServiceStateReceiver; diff --git a/smali/org/codeaurora/ims/ImsSubController.smali b/smali/org/codeaurora/ims/ImsSubController.smali -index 3f21add..e0f6feb 100644 +index 87a02b5..b272e84 100644 --- a/smali/org/codeaurora/ims/ImsSubController.smali +++ b/smali/org/codeaurora/ims/ImsSubController.smali -@@ -416,7 +416,9 @@ +@@ -336,7 +336,7 @@ + .end method - invoke-direct {v1, v2}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V + .method public constructor (Landroid/content/Context;Ljava/util/List;Ljava/util/List;Landroid/os/Looper;)V +- .locals 4 ++ .locals 5 + .param p1, "context" # Landroid/content/Context; + .param p4, "looper" # Landroid/os/Looper; + .annotation system Ldalvik/annotation/Signature; +@@ -455,7 +455,9 @@ -- invoke-virtual {p1, v0, v1}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent; -+ const/4 v2, 0x2 + invoke-direct {v2, v3}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V + +- invoke-virtual {v0, v1, v2}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent; ++ const/4 v4, 0x2 + -+ invoke-virtual {p1, v0, v1, v2}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; ++ invoke-virtual {v0, v1, v2, v4}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; - .line 217 + .line 215 iput-object p2, p0, Lorg/codeaurora/ims/ImsSubController;->mSenderRxrs:Ljava/util/List; -@@ -1267,7 +1269,9 @@ +@@ -1084,7 +1086,7 @@ + .end method + + .method private handleRafInfo()V +- .locals 10 ++ .locals 11 + + .line 699 + iget v0, p0, Lorg/codeaurora/ims/ImsSubController;->mNumMultiModeStacks:I +@@ -1316,7 +1318,9 @@ invoke-direct {v5, v6}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V - invoke-virtual {v2, v4, v5}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent; -+ const/4 v3, 0x2 ++ const/4 v10, 0x2 + -+ invoke-virtual {v2, v4, v5, v3}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; ++ invoke-virtual {v2, v4, v5, v10}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; - .line 752 + .line 746 iput-boolean v3, p0, Lorg/codeaurora/ims/ImsSubController;->mIsReceiverRegistered:Z -- -2.43.0 +2.49.0 diff --git a/ims-patches/0005-PATCH-5-5-fixup-ims-globally-set-RECEIVER_EXPORTED-f.patch b/ims-patches/0005-PATCH-5-5-fixup-ims-globally-set-RECEIVER_EXPORTED-f.patch deleted file mode 100644 index 18a9389..0000000 --- a/ims-patches/0005-PATCH-5-5-fixup-ims-globally-set-RECEIVER_EXPORTED-f.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 799edb94515218e27a8d18e7ae1ce1aef379355a Mon Sep 17 00:00:00 2001 -From: Cosmin Tanislav -Date: Fri, 9 Aug 2024 10:47:24 +0300 -Subject: [PATCH 5/5] [PATCH 5/5] fixup! ims: globally set RECEIVER_EXPORTED - for registerReceiver - -Use new locals for the RECEIVER_EXPORTED parameter to avoid -conflicts. - -W MmTelFeature: MmTelFeature Binder - createCallSession exception: java.lang.VerifyError: -Verifier rejected class org.codeaurora.ims.ImsCallModification: -void org.codeaurora.ims.ImsCallModification.( - org.codeaurora.ims.ImsCallSessionImpl, - android.content.Context, - org.codeaurora.ims.ImsSenderRxr, - android.os.Looper) -failed to verify: -void org.codeaurora.ims.ImsCallModification.( - org.codeaurora.ims.ImsCallSessionImpl, - android.content.Context, - org.codeaurora.ims.ImsSenderRxr, - android.os.Looper): -[0x65] register v3 has type Imprecise Constant: 127 but expected Reference: -java.lang.Object (declaration of 'org.codeaurora.ims.ImsCallModification' appears in /system_ext/priv-app/ims/ims.apk) ---- - smali/com/qualcomm/ims/vt/LowBatteryHandler.smali | 6 +++--- - smali/org/codeaurora/ims/ImsCallModification.smali | 2 +- - smali/org/codeaurora/ims/ImsConfigImpl.smali | 6 +++--- - smali/org/codeaurora/ims/ImsServiceSub.smali | 6 +++--- - smali/org/codeaurora/ims/ImsSubController.smali | 12 ++++++------ - 5 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali b/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali -index deff6db..6a7e841 100644 ---- a/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali -+++ b/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali -@@ -101,7 +101,7 @@ - .end method - - .method private constructor (Ljava/util/List;Landroid/content/Context;)V -- .locals 3 -+ .locals 4 - .param p2, "context" # Landroid/content/Context; - .annotation system Ldalvik/annotation/Signature; - value = { -@@ -150,9 +150,9 @@ - - invoke-direct {v1, v2}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V - -- const/4 v2, 0x2 -+ const/4 v3, 0x2 - -- invoke-virtual {p2, v0, v1, v2}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; -+ invoke-virtual {p2, v0, v1, v3}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; - - .line 49 - return-void -diff --git a/smali/org/codeaurora/ims/ImsCallModification.smali b/smali/org/codeaurora/ims/ImsCallModification.smali -index a18213b..cae0c88 100644 ---- a/smali/org/codeaurora/ims/ImsCallModification.smali -+++ b/smali/org/codeaurora/ims/ImsCallModification.smali -@@ -179,7 +179,7 @@ - .end method - - .method public constructor (Lorg/codeaurora/ims/ImsCallSessionImpl;Landroid/content/Context;Lorg/codeaurora/ims/ImsSenderRxr;Landroid/os/Looper;)V -- .locals 3 -+ .locals 4 - .param p1, "imsCallSessionImpl" # Lorg/codeaurora/ims/ImsCallSessionImpl; - .param p2, "context" # Landroid/content/Context; - .param p3, "senderRxr" # Lorg/codeaurora/ims/ImsSenderRxr; -diff --git a/smali/org/codeaurora/ims/ImsConfigImpl.smali b/smali/org/codeaurora/ims/ImsConfigImpl.smali -index 4daeb74..d91ef4f 100644 ---- a/smali/org/codeaurora/ims/ImsConfigImpl.smali -+++ b/smali/org/codeaurora/ims/ImsConfigImpl.smali -@@ -414,7 +414,7 @@ - .end method - - .method public constructor (Lorg/codeaurora/ims/ImsServiceSub;Lorg/codeaurora/ims/ImsSenderRxr;Landroid/content/Context;)V -- .locals 4 -+ .locals 5 - .param p1, "serviceSub" # Lorg/codeaurora/ims/ImsServiceSub; - .param p2, "senderRxr" # Lorg/codeaurora/ims/ImsSenderRxr; - .param p3, "context" # Landroid/content/Context; -@@ -668,9 +668,9 @@ - - iget-object v2, p0, Lorg/codeaurora/ims/ImsConfigImpl;->mBroadcastReceiver:Landroid/content/BroadcastReceiver; - -- const/4 v3, 0x2 -+ const/4 v4, 0x2 - -- invoke-virtual {v1, v2, v0, v3}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; -+ invoke-virtual {v1, v2, v0, v4}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; - - .line 257 - new-instance v1, Landroid/os/HandlerThread; -diff --git a/smali/org/codeaurora/ims/ImsServiceSub.smali b/smali/org/codeaurora/ims/ImsServiceSub.smali -index 579abd8..839b79d 100644 ---- a/smali/org/codeaurora/ims/ImsServiceSub.smali -+++ b/smali/org/codeaurora/ims/ImsServiceSub.smali -@@ -622,7 +622,7 @@ - .end method - - .method public constructor (Landroid/content/Context;ILorg/codeaurora/ims/ImsSenderRxr;Lorg/codeaurora/ims/ImsSubController;)V -- .locals 5 -+ .locals 6 - .param p1, "context" # Landroid/content/Context; - .param p2, "phoneId" # I - .param p3, "senderRxr" # Lorg/codeaurora/ims/ImsSenderRxr; -@@ -1074,9 +1074,9 @@ - - iget-object v3, p0, Lorg/codeaurora/ims/ImsServiceSub;->mImsServiceStateReceiver:Lorg/codeaurora/ims/ImsServiceStateReceiver; - -- const/4 v4, 0x2 -+ const/4 v5, 0x2 - -- invoke-virtual {v2, v3, v0, v4}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; -+ invoke-virtual {v2, v3, v0, v5}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; - - .line 312 - iget-object v2, p0, Lorg/codeaurora/ims/ImsServiceSub;->mImsServiceStateReceiver:Lorg/codeaurora/ims/ImsServiceStateReceiver; -diff --git a/smali/org/codeaurora/ims/ImsSubController.smali b/smali/org/codeaurora/ims/ImsSubController.smali -index e0f6feb..1cbc3a2 100644 ---- a/smali/org/codeaurora/ims/ImsSubController.smali -+++ b/smali/org/codeaurora/ims/ImsSubController.smali -@@ -301,7 +301,7 @@ - .end method - - .method public constructor (Landroid/content/Context;Ljava/util/List;Ljava/util/List;Landroid/os/Looper;)V -- .locals 3 -+ .locals 4 - .param p1, "context" # Landroid/content/Context; - .param p4, "looper" # Landroid/os/Looper; - .annotation system Ldalvik/annotation/Signature; -@@ -416,9 +416,9 @@ - - invoke-direct {v1, v2}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V - -- const/4 v2, 0x2 -+ const/4 v3, 0x2 - -- invoke-virtual {p1, v0, v1, v2}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; -+ invoke-virtual {p1, v0, v1, v3}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; - - .line 217 - iput-object p2, p0, Lorg/codeaurora/ims/ImsSubController;->mSenderRxrs:Ljava/util/List; -@@ -1037,7 +1037,7 @@ - .end method - - .method private handleRafInfo()V -- .locals 10 -+ .locals 11 - - .line 705 - iget v0, p0, Lorg/codeaurora/ims/ImsSubController;->mNumMultiModeStacks:I -@@ -1269,9 +1269,9 @@ - - invoke-direct {v5, v6}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V - -- const/4 v3, 0x2 -+ const/4 v10, 0x2 - -- invoke-virtual {v2, v4, v5, v3}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; -+ invoke-virtual {v2, v4, v5, v10}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent; - - .line 752 - iput-boolean v3, p0, Lorg/codeaurora/ims/ImsSubController;->mIsReceiverRegistered:Z --- -2.43.0 - diff --git a/media/blair/media_codecs_blair.xml b/media/blair/media_codecs_blair.xml deleted file mode 100644 index 1fa1048..0000000 --- a/media/blair/media_codecs_blair.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/blair/media_codecs_performance_blair.xml b/media/blair/media_codecs_performance_blair.xml index 56886e0..71f2d71 100644 --- a/media/blair/media_codecs_performance_blair.xml +++ b/media/blair/media_codecs_performance_blair.xml @@ -64,6 +64,12 @@ + + + + + + diff --git a/media/holi/media_codecs_holi.xml b/media/holi/media_codecs_holi.xml deleted file mode 100644 index 1fa1048..0000000 --- a/media/holi/media_codecs_holi.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/media_codecs_c2.xml b/media/media_codecs_c2.xml index 5abcda5..492ea4c 100644 --- a/media/media_codecs_c2.xml +++ b/media/media_codecs_c2.xml @@ -84,37 +84,125 @@ - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,5 +213,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proprietary-files-fm.txt b/proprietary-files-fm.txt index 8ea84cb..c77d055 100644 --- a/proprietary-files-fm.txt +++ b/proprietary-files-fm.txt @@ -1,6 +1,7 @@ # All unpinned blobs are extracted from the release mentioned in proprietary-files.txt # FM +system/lib64/vendor.qti.hardware.fm-V1-ndk.so:system_ext/lib64/vendor.qti.hardware.fm-V1-ndk.so system_ext/lib64/fm_helium.so system_ext/lib64/libfm-hci.so system_ext/lib64/vendor.qti.hardware.fm@1.0.so diff --git a/proprietary-files.txt b/proprietary-files.txt index f759b64..13d4da2 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# All unpinned blobs are extracted from fogos_g U1UGS34.23-110-23-6 +# All unpinned blobs are extracted from fogos_g V1UG35H.75-14-3 # ADSP vendor/bin/adsprpcd @@ -248,6 +248,7 @@ vendor/firmware/evass.mbn vendor/firmware/evass.mdt # Diag +system/lib64/vendor.qti.diaghal-V1-ndk.so:system_ext/lib64/vendor.qti.diaghal-V1-ndk.so system_ext/lib/vendor.qti.diaghal@1.0.so system_ext/lib64/vendor.qti.diaghal@1.0.so vendor/bin/diag-router @@ -642,7 +643,6 @@ product/etc/permissions/UimService.xml product/framework/uimgbalibrary.jar product/framework/uimgbamanagerlibrary.jar product/framework/uimservicelibrary.jar -system_ext/app/QtiTelephony/QtiTelephony.apk system_ext/app/QtiTelephonyService/QtiTelephonyService.apk system_ext/etc/permissions/qcrilhook.xml system_ext/etc/permissions/qti_libpermissions.xml @@ -650,6 +650,7 @@ system_ext/etc/permissions/qti_permissions.xml system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml system_ext/framework/qcrilhook.jar +system_ext/priv-app/QtiTelephony/QtiTelephony.apk system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk vendor/app/IWlanService/IWlanService.apk vendor/bin/adpl @@ -730,6 +731,13 @@ vendor/etc/qcril_database/upgrade/ecc/47_version_qcrildb.sql vendor/etc/qcril_database/upgrade/ecc/48_version_qcrildb.sql vendor/etc/qcril_database/upgrade/ecc/49_version_qcrildb.sql vendor/etc/qcril_database/upgrade/ecc/4_version_qcrildb.sql +vendor/etc/qcril_database/upgrade/ecc/50_version_qcrildb.sql +vendor/etc/qcril_database/upgrade/ecc/51_version_qcrildb.sql +vendor/etc/qcril_database/upgrade/ecc/52_version_qcrildb.sql +vendor/etc/qcril_database/upgrade/ecc/53_version_qcrildb.sql +vendor/etc/qcril_database/upgrade/ecc/54_version_qcrildb.sql +vendor/etc/qcril_database/upgrade/ecc/55_version_qcrildb.sql +vendor/etc/qcril_database/upgrade/ecc/56_version_qcrildb.sql vendor/etc/qcril_database/upgrade/ecc/5_version_qcrildb.sql vendor/etc/qcril_database/upgrade/ecc/6_version_qcrildb.sql vendor/etc/qcril_database/upgrade/ecc/7_version_qcrildb.sql @@ -863,6 +871,7 @@ vendor/lib64/lib-rtpsl.so vendor/lib64/librcc.so vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so +vendor/lib64/vendor.qti.hardware.radio.ims@1.10.so vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so vendor/lib64/vendor.qti.hardware.radio.ims@1.3.so vendor/lib64/vendor.qti.hardware.radio.ims@1.4.so @@ -1085,7 +1094,7 @@ system_ext/lib/libwfduibcsinkinterface.so system_ext/lib/libwfduibcsrc.so system_ext/lib/libwfduibcsrcinterface.so system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so -system_ext/lib64/com.qualcomm.qti.wifidisplayhal@1.0.so +system_ext/lib/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so system_ext/lib64/libmmrtpdecoder.so system_ext/lib64/libmmrtpencoder.so system_ext/lib64/libwfdavenhancements.so @@ -1106,6 +1115,7 @@ system_ext/lib64/libwfduibcsinkinterface.so system_ext/lib64/libwfduibcsrc.so system_ext/lib64/libwfduibcsrcinterface.so system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so +system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so system_ext/priv-app/WfdService/WfdService.apk vendor/bin/wfdhdcphalservice vendor/bin/wfdvndservice diff --git a/rootdir/etc/init/hw/init.mmi.rc b/rootdir/etc/init/hw/init.mmi.rc index 69ed195..ade74a9 100644 --- a/rootdir/etc/init/hw/init.mmi.rc +++ b/rootdir/etc/init/hw/init.mmi.rc @@ -146,7 +146,7 @@ on post-fs-data # Setup folder for Pre-Activation Kill Switch app (PAKS) mkdir /mnt/vendor/persist/paks 02770 vendor_tcmd vendor_tcmd - chown vendor_pwric vendor_pwric /sys/class/power_supply/battery/cycle_count + chown system system /sys/class/power_supply/battery/cycle_count chmod 0664 /sys/class/power_supply/battery/cycle_count chmod 0664 /sys/class/power_supply/battery/charge_control_limit diff --git a/vendor.prop b/vendor.prop index 17e390b..c3e571d 100644 --- a/vendor.prop +++ b/vendor.prop @@ -289,19 +289,22 @@ debug.stagefright.c2inputsurface=-1 # Surfaceflinger debug.sf.disable_client_composition_cache=1 -debug.sf.enable_advanced_sf_phase_offset=1 +debug.sf.early.app.duration=13666666 +debug.sf.early.sf.duration=10500000 +debug.sf.earlyGl.app.duration=13666666 +debug.sf.earlyGl.sf.duration=10500000 +debug.sf.enable_advanced_sf_phase_offset=0 debug.sf.enable_gl_backpressure=1 -debug.sf.high_fps_early_gl_phase_offset_ns=-4000000 -debug.sf.high_fps_early_phase_offset_ns=-4000000 -debug.sf.high_fps_late_app_phase_offset_ns=1000000 -debug.sf.high_fps_late_sf_phase_offset_ns=-4000000 debug.sf.force_cpuset_system_default=1 debug.sf.force_populate_color_modes=true debug.sf.frame_rate_multiple_threshold=120 debug.sf.high_speed_scroll_factor=0 +debug.sf.late.app.duration=13666666 +debug.sf.late.sf.duration=10500000 debug.sf.predict_hwc_composition_strategy=0 debug.sf.scroll_boost_refreshrate=120 debug.sf.touch_boost_refreshrate=90 +debug.sf.use_phase_offsets_as_durations=1 persist.sys.sf.color_mode=0 persist.sys.sf.color_saturation=1.0 persist.sys.sf.force_brightness_capability=1