Skip to content

Commit 012cfeb

Browse files
Jami Cogswellatorralba
authored andcommitted
resolve merge conflict
1 parent da7f27a commit 012cfeb

File tree

1 file changed

+12
-10
lines changed
  • java/ql/lib/semmle/code/java/frameworks/android

1 file changed

+12
-10
lines changed

java/ql/lib/semmle/code/java/frameworks/android/Intent.qll

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,18 @@ class AndroidServiceIntentMethod extends Method {
8686
}
8787
}
8888

89+
/**
90+
* The method `Context.startActivity` or `startActivities`.
91+
*
92+
* DEPRECATED: Use `StartActivityMethod` instead.
93+
*/
94+
deprecated class ContextStartActivityMethod extends Method {
95+
ContextStartActivityMethod() {
96+
(this.hasName("startActivity") or this.hasName("startActivities")) and
97+
this.getDeclaringType() instanceof TypeContext
98+
}
99+
}
100+
89101
/**
90102
* The method `Context.startActivity`, `Context.startActivities`,
91103
* `Activity.startActivity`,`Activity.startActivities`,
@@ -237,16 +249,6 @@ class GrantWriteUriPermissionFlag extends GrantUriPermissionFlag {
237249
GrantWriteUriPermissionFlag() { this.hasName("FLAG_GRANT_WRITE_URI_PERMISSION") }
238250
}
239251

240-
/*
241-
* // ! TODO: create a parent class for the below three steps?
242-
* // ! e.g. something like the below?
243-
* // ! could put `getClassArgOfIntentConstructor` in parent class?
244-
*
245-
* // ! Also look into whether it's possible to reduce any code duplication
246-
* // ! across the three steps in general.
247-
* // class StartComponentIntentStep extends AdditionalValueStep { }
248-
*/
249-
250252
/**
251253
* Gets the `Class<?>` argument of an `android.content.Intent`constructor.
252254
*

0 commit comments

Comments
 (0)