Skip to content

Commit 9a694e6

Browse files
committed
Fix mistake during merge conflict
1 parent 923e7ec commit 9a694e6

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

soot-infoflow-android/src/soot/jimple/infoflow/android/callbacks/AbstractCallbackAnalyzer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,9 +644,8 @@ protected boolean invokesInflate(InvokeExpr inv) {
644644
// of using the superclass signature
645645
SootClass curClass = inv.getMethod().getDeclaringClass();
646646
while (curClass != null) {
647-
if (curClass.getName().equals("android.app.Fragment") || curClass.getName().equals("android.view.LayoutInflater"))
648-
return true;
649-
if (curClass.declaresMethod("android.view.View inflate(int,android.view.ViewGroup,boolean)"))
647+
if (curClass.getName().equals("android.app.Fragment")
648+
|| curClass.getName().equals("android.view.LayoutInflater"))
650649
return true;
651650
curClass = curClass.hasSuperclass() ? curClass.getSuperclass() : null;
652651
}

0 commit comments

Comments
 (0)