a52sxq/m52xq: patches: knox: additional smali patches

Change-Id: I909050eedba58f8063beac4f93cb4ed3e43d57af
salvogiangri · Dec 8, 2023 · 66568c3 · 66568c3
1 parent 25d58b8
commit 66568c3
Show file tree

Hide file tree

Showing 18 changed files with 1,114 additions and 0 deletions.
diff --git a/target/a52sxq/patches/knox/smali/system/framework/knoxsdk.jar/0002-Replace-HDM-version.patch b/target/a52sxq/patches/knox/smali/system/framework/knoxsdk.jar/0002-Replace-HDM-version.patch
@@ -0,0 +1,25 @@
+From 14cff293ef4d1cab8a9389730af45fd9bda90553 Mon Sep 17 00:00:00 2001
+From: BlackMesa123 <[email protected]>
+Date: Fri, 8 Dec 2023 14:04:40 +0100
+Subject: [PATCH] Replace HDM version
+
+---
+ smali/com/samsung/android/knox/hdm/HdmManager.smali | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/smali/com/samsung/android/knox/hdm/HdmManager.smali b/smali/com/samsung/android/knox/hdm/HdmManager.smali
+index 5a15683..31dfd77 100644
+--- a/smali/com/samsung/android/knox/hdm/HdmManager.smali
++++ b/smali/com/samsung/android/knox/hdm/HdmManager.smali
+@@ -43,7 +43,7 @@
+
+     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
+
+-    const-string v0, "3.0 - 115"
++    const-string v0, "2.0 - 5"
+
+     return-object v0
+ .end method
+-- 
+2.43.0
+
diff --git a/...sxq/patches/knox/smali/system/priv-app/KnoxCore/KnoxCore.apk/0001-Nuke-Knox-DualDAR.patch b/...sxq/patches/knox/smali/system/priv-app/KnoxCore/KnoxCore.apk/0001-Nuke-Knox-DualDAR.patch
@@ -0,0 +1,135 @@
+From 9f7a4f66194a5f22cbd1488dc2849f904dea7309 Mon Sep 17 00:00:00 2001
+From: BlackMesa123 <[email protected]>
+Date: Fri, 8 Dec 2023 13:57:25 +0100
+Subject: [PATCH] Nuke Knox DualDAR
+
+---
+ .../provisioning/DualDarStartedService.smali  | 112 ------------------
+ 1 file changed, 112 deletions(-)
+
+diff --git a/smali/com/samsung/android/knox/containercore/provisioning/DualDarStartedService.smali b/smali/com/samsung/android/knox/containercore/provisioning/DualDarStartedService.smali
+index e82668d..7b48680 100644
+--- a/smali/com/samsung/android/knox/containercore/provisioning/DualDarStartedService.smali
++++ b/smali/com/samsung/android/knox/containercore/provisioning/DualDarStartedService.smali
+@@ -1730,118 +1730,6 @@
+ .method private validatePrerequisiteForDualDar(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;ZZ)I
+     .locals 0
+
+-    const-string p0, "KNOXCORE::DualDarStartedService"
+-
+-    const/4 p2, 0x0
+-
+-    :try_start_0
+-    invoke-static {}, Lcom/android/internal/widget/LockPatternUtils;->isFileEncryptionEnabled()Z
+-
+-    move-result p4
+-
+-    if-nez p4, :cond_0
+-
+-    const-string p1, "Device does be set DualDAR. DualDAR can not be setup"
+-
+-    new-array p3, p2, [Ljava/lang/Object;
+-
+-    invoke-static {p0, p1, p3}, Lcom/samsung/android/knox/containercore/dualdar/DDLog;->e(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)I
+-
+-    const/4 p0, 0x2
+-
+-    return p0
+-
+-    :cond_0
+-    const-string p4, "Start DualDAR internal services !"
+-
+-    new-array p5, p2, [Ljava/lang/Object;
+-
+-    invoke-static {p0, p4, p5}, Lcom/samsung/android/knox/containercore/dualdar/DDLog;->d(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)I
+-
+-    invoke-static {p1}, Lcom/samsung/android/knox/EnterpriseDeviceManager;->getInstance(Landroid/content/Context;)Lcom/samsung/android/knox/EnterpriseDeviceManager;
+-
+-    move-result-object p1
+-
+-    invoke-virtual {p1}, Lcom/samsung/android/knox/EnterpriseDeviceManager;->startDualDARServices()V
+-
+-    if-eqz p3, :cond_1
+-
+-    const-string p1, "dualdar-config-client-package"
+-
+-    invoke-virtual {p3, p1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+-
+-    move-result-object p1
+-
+-    goto :goto_0
+-
+-    :cond_1
+-    const/4 p1, 0x0
+-
+-    :goto_0
+-    invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+-
+-    move-result p3
+-
+-    if-nez p3, :cond_2
+-
+-    const-string p3, "package"
+-
+-    invoke-static {p3}, Landroid/os/ServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder;
+-
+-    move-result-object p3
+-
+-    invoke-static {p3}, Landroid/content/pm/IPackageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageManager;
+-
+-    move-result-object p3
+-
+-    const-wide/32 p4, 0x8000000
+-
+-    invoke-interface {p3, p1, p4, p5, p2}, Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;JI)Landroid/content/pm/PackageInfo;
+-
+-    move-result-object p1
+-
+-    if-nez p1, :cond_2
+-
+-    const-string p1, "DualDARclient doesn\'t exist ! Please install client package and create container"
+-
+-    new-array p3, p2, [Ljava/lang/Object;
+-
+-    invoke-static {p0, p1, p3}, Lcom/samsung/android/knox/containercore/dualdar/DDLog;->e(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)I
+-    :try_end_0
+-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+-
+-    return p2
+-
+-    :cond_2
+-    const/16 p0, 0xa
+-
+-    return p0
+-
+-    :catch_0
+-    move-exception p1
+-
+-    new-instance p3, Ljava/lang/StringBuilder;
+-
+-    invoke-direct {p3}, Ljava/lang/StringBuilder;-><init>()V
+-
+-    const-string p4, "Exception in validatePrequisiteForDualDAR "
+-
+-    invoke-virtual {p3, p4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+-
+-    invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
+-
+-    move-result-object p1
+-
+-    invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+-
+-    invoke-virtual {p3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+-
+-    move-result-object p1
+-
+-    new-array p2, p2, [Ljava/lang/Object;
+-
+-    invoke-static {p0, p1, p2}, Lcom/samsung/android/knox/containercore/dualdar/DDLog;->e(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)I
+-
+     const/4 p0, 0x5
+
+     return p0
+-- 
+2.43.0
+
diff --git a/.../system/priv-app/ManagedProvisioning/ManagedProvisioning.apk/0001-Nuke-Knox-DualDAR.patch b/.../system/priv-app/ManagedProvisioning/ManagedProvisioning.apk/0001-Nuke-Knox-DualDAR.patch
@@ -0,0 +1,87 @@
+From 754918c535f0f78a173a253f78400b7c8cb3ca1e Mon Sep 17 00:00:00 2001
+From: BlackMesa123 <[email protected]>
+Date: Fri, 8 Dec 2023 13:48:23 +0100
+Subject: [PATCH] Nuke Knox DualDAR
+
+---
+ .../knox/container/KnoxContainerManager.smali | 39 ++-----------------
+ .../android/knox/ddar/DualDARPolicy.smali     |  4 +-
+ 2 files changed, 5 insertions(+), 38 deletions(-)
+
+diff --git a/smali/com/samsung/android/knox/container/KnoxContainerManager.smali b/smali/com/samsung/android/knox/container/KnoxContainerManager.smali
+index 2396686..5301383 100644
+--- a/smali/com/samsung/android/knox/container/KnoxContainerManager.smali
++++ b/smali/com/samsung/android/knox/container/KnoxContainerManager.smali
+@@ -3791,44 +3791,11 @@
+ .end method
+
+ .method public getDualDARPolicy()Lcom/samsung/android/knox/ddar/DualDARPolicy;
+-    .locals 2
+-
+-    iget-object v0, p0, Lcom/samsung/android/knox/container/KnoxContainerManager;->mDualDARPolicy:Lcom/samsung/android/knox/ddar/DualDARPolicy;
+-
+-    if-nez v0, :cond_1
+-
+-    monitor-enter p0
+-
+-    :try_start_0
+-    iget-object v0, p0, Lcom/samsung/android/knox/container/KnoxContainerManager;->mDualDARPolicy:Lcom/samsung/android/knox/ddar/DualDARPolicy;
+-
+-    if-nez v0, :cond_0
+-
+-    new-instance v0, Lcom/samsung/android/knox/ddar/DualDARPolicy;
+-
+-    iget-object v1, p0, Lcom/samsung/android/knox/container/KnoxContainerManager;->mContextInfo:Lcom/samsung/android/knox/ContextInfo;
+-
+-    invoke-direct {v0, v1}, Lcom/samsung/android/knox/ddar/DualDARPolicy;-><init>(Lcom/samsung/android/knox/ContextInfo;)V
+-
+-    iput-object v0, p0, Lcom/samsung/android/knox/container/KnoxContainerManager;->mDualDARPolicy:Lcom/samsung/android/knox/ddar/DualDARPolicy;
+-
+-    :cond_0
+-    monitor-exit p0
+-
+-    goto :goto_0
+-
+-    :catchall_0
+-    move-exception v0
+-
+-    monitor-exit p0
+-    :try_end_0
+-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
++    .locals 0
+
+-    throw v0
++    iget-object p0, p0, Lcom/samsung/android/knox/container/KnoxContainerManager;->mDualDARPolicy:Lcom/samsung/android/knox/ddar/DualDARPolicy;
+
+-    :cond_1
+-    :goto_0
+-    return-object v0
++    return-object p0
+ .end method
+
+ .method public getEmailAccountPolicy()Lcom/samsung/android/knox/accounts/EmailAccountPolicy;
+diff --git a/smali/com/samsung/android/knox/ddar/DualDARPolicy.smali b/smali/com/samsung/android/knox/ddar/DualDARPolicy.smali
+index a9d2cda..d74ca15 100644
+--- a/smali/com/samsung/android/knox/ddar/DualDARPolicy.smali
++++ b/smali/com/samsung/android/knox/ddar/DualDARPolicy.smali
+@@ -100,7 +100,7 @@
+ .method public static getDualDARVersion()Ljava/lang/String;
+     .locals 1
+
+-    const-string v0, "1.6.0"
++    const/4 v0, 0x0
+
+     return-object v0
+ .end method
+@@ -133,7 +133,7 @@
+ .method public static isDualDarSupportedForManagedDevice()Z
+     .locals 1
+
+-    const/4 v0, 0x1
++    const/4 v0, 0x0
+
+     return v0
+ .end method
+-- 
+2.43.0
+
diff --git a/...ystem/priv-app/ManagedProvisioning/ManagedProvisioning.apk/0002-Replace-HDM-version.patch b/...ystem/priv-app/ManagedProvisioning/ManagedProvisioning.apk/0002-Replace-HDM-version.patch
@@ -0,0 +1,34 @@
+From 0ae4b8b4a996059864e6877c65e4ad416ff08445 Mon Sep 17 00:00:00 2001
+From: BlackMesa123 <[email protected]>
+Date: Fri, 8 Dec 2023 13:48:46 +0100
+Subject: [PATCH] Replace HDM version
+
+---
+ smali/com/samsung/android/knox/hdm/HdmManager.smali | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/smali/com/samsung/android/knox/hdm/HdmManager.smali b/smali/com/samsung/android/knox/hdm/HdmManager.smali
+index c934838..e0b4cd1 100644
+--- a/smali/com/samsung/android/knox/hdm/HdmManager.smali
++++ b/smali/com/samsung/android/knox/hdm/HdmManager.smali
+@@ -75,7 +75,7 @@
+
+     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+-    const-string v1, "3.0"
++    const-string v1, "2.0"
+
+     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+@@ -83,7 +83,7 @@
+
+     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+-    const-string v1, "115"
++    const-string v1, "5"
+
+     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+-- 
+2.43.0
+
diff --git a/...hes/knox/smali/system/priv-app/SecSettings/SecSettings.apk/0002-Replace-HDM-version.patch b/...hes/knox/smali/system/priv-app/SecSettings/SecSettings.apk/0002-Replace-HDM-version.patch
@@ -0,0 +1,34 @@
+From e427e1532ceff43e0868056990d3d796cfd7fc15 Mon Sep 17 00:00:00 2001
+From: BlackMesa123 <[email protected]>
+Date: Fri, 8 Dec 2023 14:08:20 +0100
+Subject: [PATCH] Replace HDM version
+
+---
+ smali_classes4/com/samsung/android/knox/hdm/HdmManager.smali | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/smali_classes4/com/samsung/android/knox/hdm/HdmManager.smali b/smali_classes4/com/samsung/android/knox/hdm/HdmManager.smali
+index 9079bf85..12cda7e8 100644
+--- a/smali_classes4/com/samsung/android/knox/hdm/HdmManager.smali
++++ b/smali_classes4/com/samsung/android/knox/hdm/HdmManager.smali
+@@ -75,7 +75,7 @@
+
+     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
+
+-    const-string v1, "3.0"
++    const-string v1, "2.0"
+
+     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+@@ -83,7 +83,7 @@
+
+     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+-    const-string v1, "115"
++    const-string v1, "5"
+
+     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+-- 
+2.43.0
+