mirror of
https://github.com/github/codeql.git
synced 2026-05-05 21:55:19 +02:00
resolve merge conflict
This commit is contained in:
committed by
Tony Torralba
parent
d07babe3c5
commit
47fcbdd4b4
@@ -1,5 +0,0 @@
|
||||
// ! adding tests in `intent` directory instead for now
|
||||
public class Test {
|
||||
|
||||
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/google-android-9.0.0
|
||||
@@ -1,2 +0,0 @@
|
||||
import java
|
||||
import TestUtilities.InlineFlowTest
|
||||
@@ -10,7 +10,8 @@ public class TestStartComponentToIntent {
|
||||
return null;
|
||||
}
|
||||
|
||||
static void sink(Object sink) {}
|
||||
static void sink(Object sink) {
|
||||
}
|
||||
|
||||
public void testActivity(Context ctx) {
|
||||
Intent intent = new Intent(null, SomeActivity.class);
|
||||
@@ -26,19 +27,19 @@ public class TestStartComponentToIntent {
|
||||
}
|
||||
|
||||
// ! WIP
|
||||
public void testService(Context ctx) {
|
||||
public void testService(Context ctx) {
|
||||
Intent intent = new Intent(null, SomeService.class);
|
||||
intent.putExtra("data", (String) source());
|
||||
ctx.startService(intent);
|
||||
}
|
||||
|
||||
public void testBroadcastReceiver(Context ctx) {
|
||||
public void testBroadcastReceiver(Context ctx) {
|
||||
Intent intent = new Intent(null, SomeBroadcastReceiver.class);
|
||||
intent.putExtra("data", (String) source());
|
||||
ctx.sendBroadcast(intent);
|
||||
}
|
||||
|
||||
static class SomeService extends Service {
|
||||
static class SomeService extends Service {
|
||||
|
||||
public void test() {
|
||||
// ! WIP
|
||||
@@ -46,7 +47,7 @@ public class TestStartComponentToIntent {
|
||||
}
|
||||
}
|
||||
|
||||
static class SomeBroadcastReceiver extends BroadcastReceiver {
|
||||
static class SomeBroadcastReceiver extends BroadcastReceiver {
|
||||
|
||||
public void test() {
|
||||
// ! WIP
|
||||
|
||||
Reference in New Issue
Block a user