From 4092be9c059931c1f4746a6bf20b935c07402792 Mon Sep 17 00:00:00 2001
From: Marc Miltenberger <Marc.Miltenberger@sit.fraunhofer.de>
Date: Thu, 23 Dec 2021 14:30:50 +0100
Subject: [PATCH] Gnarf

---
 src/main/java/soot/dexpler/DexBody.java                     | 3 +--
 src/main/java/soot/jimple/toolkits/typing/TypeAssigner.java | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/soot/dexpler/DexBody.java b/src/main/java/soot/dexpler/DexBody.java
index c4c2265132c..69031d2d0ba 100755
--- a/src/main/java/soot/dexpler/DexBody.java
+++ b/src/main/java/soot/dexpler/DexBody.java
@@ -29,6 +29,7 @@
 
 import static soot.dexpler.instructions.InstructionFactory.fromInstruction;
 
+import com.google.common.collect.ArrayListMultimap;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -61,8 +62,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ArrayListMultimap;
-
 import soot.Body;
 import soot.DoubleType;
 import soot.Local;
diff --git a/src/main/java/soot/jimple/toolkits/typing/TypeAssigner.java b/src/main/java/soot/jimple/toolkits/typing/TypeAssigner.java
index 8cf59d30587..00eca5d43a8 100644
--- a/src/main/java/soot/jimple/toolkits/typing/TypeAssigner.java
+++ b/src/main/java/soot/jimple/toolkits/typing/TypeAssigner.java
@@ -217,11 +217,6 @@ protected static void replaceNullType(Body b) {
     }
 
     for (Unit u : unitToReplaceByException) {
-      if (b.getMethod().getDeclaringClass().getFieldCount() == 3) {
-        if (b.getMethod().getParameterCount() == 0 && b.toString().contains("android.database.ContentObserver")
-            && u.toString().contains("unregisterContentObserver"))
-          System.out.println();
-      }
       soot.dexpler.Util.addExceptionAfterUnit(b, "java.lang.NullPointerException", u,
           "This statement would have triggered an Exception: " + u);
       b.getUnits().remove(u);