sm7325-common: Rework ims patches

Change-Id: Ib8589f65c8cbcd362a74141555546dc9c5caac2c

ims-patches/0001-ImsConfigImpl-Return-0-in-getWfcMDN-in-any-case.patch

@@ -1,35 +1,39 @@
-From cfd224560c7d76c9bc219eb2c12b099e1537956c Mon Sep 17 00:00:00 2001
+From 0f3f402c9718d24a66d3a59b36c167de848fcff9 Mon Sep 17 00:00:00 2001
 From: Erfan Abdi <erfangplus@gmail.com>
 Date: Sun, 26 Jan 2020 20:23:44 +0330
-Subject: [PATCH 1/3] ImsConfigImpl: Return 0 in getWfcMDN in any case
+Subject: [PATCH 1/5] ImsConfigImpl: Return 0 in getWfcMDN in any case
 
 ---
- smali/org/codeaurora/ims/ImsConfigImpl.smali | 14 --------------
+ smali/org/codeaurora/ims/ImsConfigImpl.smali | 13 -------------
- 1 file changed, 14 deletions(-)
+ 1 file changed, 13 deletions(-)
 
 diff --git a/smali/org/codeaurora/ims/ImsConfigImpl.smali b/smali/org/codeaurora/ims/ImsConfigImpl.smali
-index 8daf3342..b2ab6538 100644
+index 644a553..c921038 100644
 --- a/smali/org/codeaurora/ims/ImsConfigImpl.smali
 +++ b/smali/org/codeaurora/ims/ImsConfigImpl.smali
-@@ -1385,22 +1385,8 @@
+@@ -1471,22 +1471,9 @@
      .param p1, "subid"    # I
-
+ 
-     .line 814
+     .line 849
--    iget-object v0, p0, Lorg/codeaurora/ims/ImsConfigImpl;->mContext:Landroid/content/Context;
+-    const-string v0, "wfc_ims_mdn"
 -
--    const-string v1, "wfc_ims_mdn"
+-    iget-object v1, p0, Lorg/codeaurora/ims/ImsConfigImpl;->mContext:Landroid/content/Context;
 -
--    invoke-static {p1, v1, v0}, Landroid/telephony/SubscriptionManager;->getSubscriptionProperty(ILjava/lang/String;Landroid/content/Context;)Ljava/lang/String;
+-    invoke-virtual {p0, p1, v0, v1}, Lorg/codeaurora/ims/ImsConfigImpl;->getSubscriptionProperty(ILjava/lang/String;Landroid/content/Context;)Ljava/lang/String;
 -
 -    move-result-object v0
 -
--    .line 816
+-    .line 851
 -    .local v0, "mdn":Ljava/lang/String;
 -    if-nez v0, :cond_0
--
+ 
      const-string v0, "0"
-
+ 
--    .line 817
+-    .line 852
 -    :cond_0
      return-object v0
  .end method
+ 
+-- 
+2.43.0
+

ims-patches/0002-ImsConfigImpl-don-t-call-setSubscriptionProperty-for.patch

@@ -1,7 +1,7 @@
-From ab173b9875550f2462b8ed80ada0dff9bd2804d0 Mon Sep 17 00:00:00 2001
+From 9f41786278a80f4e8f8629ae13b1d5cc38c85fde Mon Sep 17 00:00:00 2001
 From: Vachounet <vachounet@live.fr>
 Date: Wed, 27 Jan 2021 23:28:48 +0100
-Subject: [PATCH 2/3] ImsConfigImpl: don't call setSubscriptionProperty for
+Subject: [PATCH 2/5] ImsConfigImpl: don't call setSubscriptionProperty for
  wfc_ims_mdn
 
 ---
@@ -9,11 +9,11 @@ Subject: [PATCH 2/3] 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 c921038c..c38fe206 100644
+index c921038..c38fe20 100644
 --- a/smali/org/codeaurora/ims/ImsConfigImpl.smali
 +++ b/smali/org/codeaurora/ims/ImsConfigImpl.smali
 @@ -3070,76 +3070,6 @@
-
+ 
      .line 790
      :cond_2
 -    if-ne p1, v2, :cond_3
@@ -87,5 +87,8 @@ index c921038c..c38fe206 100644
 -    :cond_3
 -    :goto_1
      const/16 v3, 0x2c
-
+ 
      const/4 v5, 0x1
+-- 
+2.43.0
+

ims-patches/0003-ims-remove-uses-library-for-moto-ims-ext.patch

@@ -1,7 +1,7 @@
-From cadd5ec3e6f097bd5619e22bf827fb685e38c1d2 Mon Sep 17 00:00:00 2001
+From 4dd42142e2fbb2afd60ca6d8b4ac497c8d978f74 Mon Sep 17 00:00:00 2001
 From: Andrew Hexen <SyberHexen@gmail.com>
 Date: Thu, 25 May 2023 11:51:44 -0700
-Subject: [PATCH 3/3] ims: remove uses-library for moto-ims-ext
+Subject: [PATCH 3/5] 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,7 +13,7 @@ Signed-off-by: Andrew Hexen <SyberHexen@gmail.com>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 3b3dc516..6f4b3de4 100644
+index 3b3dc51..6f4b3de 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
 @@ -48,9 +48,8 @@
@@ -28,3 +28,6 @@ index 3b3dc516..6f4b3de4 100644
 -</manifest>
 \ No newline at end of file
 +</manifest>
+-- 
+2.43.0
+

ims-patches/0004-ims-globally-set-RECEIVER_EXPORTED-for-registerRecei.patch

@@ -1,7 +1,7 @@
-From 789e1c4dace46b872198b5180ea77afb1b1a2c17 Mon Sep 17 00:00:00 2001
+From 74cc53ffea595daf25e176fb1783641994fb794d Mon Sep 17 00:00:00 2001
 From: SGCMarkus <markusornik@gmail.com>
 Date: Wed, 21 Feb 2024 19:18:49 +0100
-Subject: [PATCH] ims: globally set RECEIVER_EXPORTED for registerReceiver
+Subject: [PATCH 4/5] ims: globally set RECEIVER_EXPORTED for registerReceiver
 
 E AndroidRuntime: FATAL EXCEPTION: main
 E AndroidRuntime: Process: org.codeaurora.ims, PID: 3692
@@ -15,7 +15,7 @@ E AndroidRuntime: java.lang.RuntimeException: Unable to create service org.codea
  5 files changed, 18 insertions(+), 6 deletions(-)
 
 diff --git a/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali b/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali
-index d69a656b..deff6dba 100644
+index d69a656..deff6db 100644
 --- a/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali
 +++ b/smali/com/qualcomm/ims/vt/LowBatteryHandler.smali
 @@ -150,7 +150,9 @@
@@ -30,7 +30,7 @@ index d69a656b..deff6dba 100644
      .line 49
      return-void
 diff --git a/smali/org/codeaurora/ims/ImsCallModification.smali b/smali/org/codeaurora/ims/ImsCallModification.smali
-index 3c209dfd..a18213bf 100644
+index 3c209df..a18213b 100644
 --- a/smali/org/codeaurora/ims/ImsCallModification.smali
 +++ b/smali/org/codeaurora/ims/ImsCallModification.smali
 @@ -300,7 +300,9 @@
@@ -45,7 +45,7 @@ index 3c209dfd..a18213bf 100644
      .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 c38fe206..4daeb745 100644
+index c38fe20..4daeb74 100644
 --- a/smali/org/codeaurora/ims/ImsConfigImpl.smali
 +++ b/smali/org/codeaurora/ims/ImsConfigImpl.smali
 @@ -668,7 +668,9 @@
@@ -60,7 +60,7 @@ index c38fe206..4daeb745 100644
      .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 4a4a489d..579abd88 100644
+index 4a4a489..579abd8 100644
 --- a/smali/org/codeaurora/ims/ImsServiceSub.smali
 +++ b/smali/org/codeaurora/ims/ImsServiceSub.smali
 @@ -1074,7 +1074,9 @@
@@ -75,7 +75,7 @@ index 4a4a489d..579abd88 100644
      .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 3f21add4..e0f6feb0 100644
+index 3f21add..e0f6feb 100644
 --- a/smali/org/codeaurora/ims/ImsSubController.smali
 +++ b/smali/org/codeaurora/ims/ImsSubController.smali
 @@ -416,7 +416,9 @@
@@ -100,3 +100,6 @@ index 3f21add4..e0f6feb0 100644
  
      .line 752
      iput-boolean v3, p0, Lorg/codeaurora/ims/ImsSubController;->mIsReceiverRegistered:Z
+-- 
+2.43.0
+

ims-patches/0005-PATCH-5-5-fixup-ims-globally-set-RECEIVER_EXPORTED-f.patch

@@ -1,8 +1,8 @@
-From 9aa16907f82bd04629f8516b3c2ca082a6d73e67 Mon Sep 17 00:00:00 2001
+From 799edb94515218e27a8d18e7ae1ce1aef379355a Mon Sep 17 00:00:00 2001
 From: Cosmin Tanislav <demonsingur@gmail.com>
 Date: Fri, 9 Aug 2024 10:47:24 +0300
-Subject: [PATCH 5/5] fixup! ims: globally set RECEIVER_EXPORTED for
+Subject: [PATCH 5/5] [PATCH 5/5] fixup! ims: globally set RECEIVER_EXPORTED
- registerReceiver
+ for  registerReceiver
 
 Use new locals for the RECEIVER_EXPORTED parameter to avoid
 conflicts.
@@ -31,12 +31,12 @@ java.lang.Object (declaration of 'org.codeaurora.ims.ImsCallModification' appear
  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 deff6dba..6a7e841d 100644
+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 <init>(Ljava/util/List;Landroid/content/Context;)V
 -    .locals 3
 +    .locals 4
@@ -44,24 +44,24 @@ index deff6dba..6a7e841d 100644
      .annotation system Ldalvik/annotation/Signature;
          value = {
 @@ -150,9 +150,9 @@
-
+ 
      invoke-direct {v1, v2}, Landroid/content/IntentFilter;-><init>(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 a18213bf..cae0c88f 100644
+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 <init>(Lorg/codeaurora/ims/ImsCallSessionImpl;Landroid/content/Context;Lorg/codeaurora/ims/ImsSenderRxr;Landroid/os/Looper;)V
 -    .locals 3
 +    .locals 4
@@ -69,12 +69,12 @@ index a18213bf..cae0c88f 100644
      .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 4daeb745..d91ef4fb 100644
+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 <init>(Lorg/codeaurora/ims/ImsServiceSub;Lorg/codeaurora/ims/ImsSenderRxr;Landroid/content/Context;)V
 -    .locals 4
 +    .locals 5
@@ -82,24 +82,24 @@ index 4daeb745..d91ef4fb 100644
      .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 579abd88..839b79d9 100644
+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 <init>(Landroid/content/Context;ILorg/codeaurora/ims/ImsSenderRxr;Lorg/codeaurora/ims/ImsSubController;)V
 -    .locals 5
 +    .locals 6
@@ -107,24 +107,24 @@ index 579abd88..839b79d9 100644
      .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 e0f6feb0..1cbc3a2f 100644
+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 <init>(Landroid/content/Context;Ljava/util/List;Ljava/util/List;Landroid/os/Looper;)V
 -    .locals 3
 +    .locals 4
@@ -132,35 +132,38 @@ index e0f6feb0..1cbc3a2f 100644
      .param p4, "looper"    # Landroid/os/Looper;
      .annotation system Ldalvik/annotation/Signature;
 @@ -416,9 +416,9 @@
-
+ 
      invoke-direct {v1, v2}, Landroid/content/IntentFilter;-><init>(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;-><init>(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
+