hwEmui: Patch out Huawei logging static fields

09-22 23:33:07.570 2057 2057 E AndroidRuntime: java.lang.NoSuchFieldError: No static field HWINFO of type Z in class Landroid/util/Log; or its superclasses (declaration of 'android.util.Log' appears in /system/framework/framework.jar!classes3.dex) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at huawei.android.app.admin.TransactionSponsor.<clinit>(TransactionSponsor.java:21) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at huawei.android.app.admin.HwDevicePolicyManagerEx.<init>(HwDevicePolicyManagerEx.java:26) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.telephony.HwTelephonyManagerInner.<init>(HwTelephonyManagerInner.java:145) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.telephony.HwTelephonyManagerInner.<clinit>(HwTelephonyManagerInner.java:193) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.telephony.HwTelephonyManagerInner.getDefault(HwTelephonyManagerInner.java:197) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.telephony.HwTelephonyManager.getDefault4GSlotId(HwTelephonyManager.java:494) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at com.huawei.ims.ImsCallProviderUtils.getSubId(ImsCallProviderUtils.java:398) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at com.huawei.ims.HwImsServiceImpl.getDefaultPhone(HwImsServiceImpl.java:2893) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at com.huawei.ims.HwImsServiceImpl.updatePhoneBaseEvent(HwImsServiceImpl.java:2940) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at com.huawei.ims.HwImsServiceImpl.<init>(HwImsServiceImpl.java:569) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at com.huawei.ims.HwImsService.onCreate(HwImsService.java:56) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.app.ActivityThread.handleCreateService(ActivityThread.java:4486) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.app.ActivityThread.-$$Nest$mhandleCreateService(Unknown Source:0) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2161) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:106) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.os.Looper.loopOnce(Looper.java:201) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.os.Looper.loop(Looper.java:288) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:7924) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548) 09-22 23:33:07.570 2057 2057 E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:936) * sed -i 's#sget-boolean [^,]*, Landroid/util/Log;->HWINFO:Z#const/4 v0, 0x0#' $(grep -rl "HWINFO:Z" ./smali) * sed -i 's#sget-boolean [^,]*, Landroid/util/Log;->HWModuleLog:Z#const/4 v0, 0x0#' $(grep -rl "HWModuleLog:Z" ./smali)
hisi-oss · Sep 23, 2024 · 350a458 · 350a458
1 parent 85ad5f0
commit 350a458
Show file tree

Hide file tree

Showing 27 changed files with 152 additions and 152 deletions.
diff --git a/smali/android/app/hwfeature/HwFeatureManager.smali b/smali/android/app/hwfeature/HwFeatureManager.smali
@@ -81,7 +81,7 @@
     if-nez v1, :cond_1
 
     .line 41
-    sget-boolean v1, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-eqz v1, :cond_0
 
@@ -414,7 +414,7 @@
     .end local v4    # "packageName":Ljava/lang/String;
     :cond_1
     :goto_1
-    sget-boolean v2, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-eqz v2, :cond_2
 

diff --git a/smali/android/app/mtm/MultiTaskManager.smali b/smali/android/app/mtm/MultiTaskManager.smali
@@ -112,7 +112,7 @@
     if-nez v1, :cond_2
 
     .line 76
-    sget-boolean v1, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-eqz v1, :cond_1
 
@@ -927,7 +927,7 @@
     if-nez v0, :cond_1
 
     .line 315
-    sget-boolean v1, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-eqz v1, :cond_0
 
@@ -957,7 +957,7 @@
 
     .line 321
     .local v1, "e":Landroid/os/RemoteException;
-    sget-boolean v2, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-eqz v2, :cond_2
 

diff --git a/smali/android/app/mtm/MultiTaskUtils.smali b/smali/android/app/mtm/MultiTaskUtils.smali
@@ -54,11 +54,11 @@
     .locals 2
 
     .line 46
-    sget-boolean v0, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-nez v0, :cond_1
 
-    sget-boolean v0, Landroid/util/Log;->HWModuleLog:Z
+    const/4 v0, 0x0
 
     if-eqz v0, :cond_0
 
@@ -167,7 +167,7 @@
     if-nez v0, :cond_2
 
     .line 69
-    sget-boolean v1, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-eqz v1, :cond_1
 

diff --git a/smali/android/emcom/SmartcareInfos$SmartcareBaseInfo.smali b/smali/android/emcom/SmartcareInfos$SmartcareBaseInfo.smali
@@ -46,7 +46,7 @@
     iput-object p1, p0, Landroid/emcom/SmartcareInfos$SmartcareBaseInfo;->smarcareInfos:Landroid/emcom/SmartcareInfos;
 
     .line 37
-    sget-boolean v0, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-eqz v0, :cond_0
 
@@ -105,7 +105,7 @@
     iput-object v0, p0, Landroid/emcom/SmartcareInfos$SmartcareBaseInfo;->pkgName:Ljava/lang/String;
 
     .line 45
-    sget-boolean v0, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-eqz v0, :cond_0
 

diff --git a/smali/android/location/HwAGPSManager.smali b/smali/android/location/HwAGPSManager.smali
@@ -118,11 +118,11 @@
     .locals 2
 
     .line 21
-    sget-boolean v0, Landroid/util/Log;->HWINFO:Z
+    const/4 v0, 0x0
 
     if-nez v0, :cond_1
 
-    sget-boolean v0, Landroid/util/Log;->HWModuleLog:Z
+    const/4 v0, 0x0
 
     if-eqz v0, :cond_0