Revert "Create EventlibService."
This reverts commit 93c0427f66b8918067e8f45f0ad62dcd21da52d0.
Reason for revert: Looks like this breaks all the bedstead post-submit tests.
https://android-build.googleplex.com/builds/tests/view?invocationId=I97100009998707966&redirect=https%3A%2F%2Fsponge2.corp.google.com%2Ffbabc879-fe3e-41d2-83ac-3db8080f71f7&testResultId=TR36027809017128826
https://android-build.googleplex.com/builds/tests/view?invocationId=I51000009998703654&redirect=https%3A%2F%2Fsponge2.corp.google.com%2F249fdb04-0daa-41c3-99e1-e4df829f1321&testResultId=TR02227809018471680
https://android-build.googleplex.com/builds/tests/view?invocationId=I37600009998164552&redirect=https%3A%2F%2Fsponge2.corp.google.com%2Faa2820d5-3fb3-47d7-af5a-af807aeabede&testResultId=TR44527809031048467
https://android-build.googleplex.com/builds/7952162/branches/git_master/targets/cf_x86_64_phone-userdebug/cls?end=7952146
Change-Id: Ia6f643229e91c5fa2f3a5462d71efbea8fe7fb35
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceBoundEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceBoundEvent.java
deleted file mode 100644
index a59b725..0000000
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceBoundEvent.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import android.app.Service;
-import android.content.Intent;
-
-import androidx.annotation.CheckResult;
-
-import com.android.eventlib.Event;
-import com.android.eventlib.EventLogger;
-import com.android.eventlib.EventLogsQuery;
-import com.android.queryable.info.ServiceInfo;
-import com.android.queryable.queries.IntentQuery;
-import com.android.queryable.queries.IntentQueryHelper;
-import com.android.queryable.queries.ServiceQuery;
-import com.android.queryable.queries.ServiceQueryHelper;
-import com.android.queryable.util.SerializableParcelWrapper;
-
-/**
- * Event logged when {@link Service#onBind(Intent)}
- */
-public class ServiceBoundEvent extends Event {
-
- private static final long serialVersionUID = 1;
-
- /** Begins a query for {@link ServiceBoundEvent} events. */
- public static ServiceBoundEventQuery queryPackage(String packageName) {
- return new ServiceBoundEventQuery(packageName);
- }
-
- /** {@link EventLogsQuery} for {@link ServiceBoundEvent}. */
- public static final class ServiceBoundEventQuery
- extends EventLogsQuery<ServiceBoundEvent, ServiceBoundEventQuery> {
-
- private static final long serialVersionUID = 1;
-
- ServiceQueryHelper<ServiceBoundEventQuery> mService = new ServiceQueryHelper<>(this);
- IntentQueryHelper<ServiceBoundEventQuery> mIntent = new IntentQueryHelper<>(this);
-
- private ServiceBoundEventQuery(String packageName) {
- super(ServiceBoundEvent.class, packageName);
- }
-
- /**
- * Query {@link Intent} passed into {@link Service#onBind(Intent)}.
- */
- @CheckResult
- public IntentQuery<ServiceBoundEventQuery> whereIntent() {
- return mIntent;
- }
-
- /** Query {@link Service}. */
- @CheckResult
- public ServiceQuery<ServiceBoundEvent.ServiceBoundEventQuery> whereService() {
- return mService;
- }
-
- @Override
- protected boolean filter(ServiceBoundEvent event) {
- if (!mIntent.matches(event.mIntent)) {
- return false;
- }
- if (!mService.matches(event.mService)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String describeQuery(String fieldName) {
- return toStringBuilder(ServiceBoundEvent.class, this)
- .field("intent", mIntent)
- .field("service", mService)
- .toString();
- }
- }
-
-
- /** Begins logging a {@link ServiceBoundEvent}. */
- public static ServiceBoundEventLogger logger(Service service,
- android.content.pm.ServiceInfo serviceInfo, Intent intent) {
- return new ServiceBoundEventLogger(service, serviceInfo, intent);
- }
-
- /** {@link EventLogger} for {@link ServiceBoundEvent}. */
- public static final class ServiceBoundEventLogger extends EventLogger<ServiceBoundEvent> {
-
- private ServiceBoundEventLogger(Service service, android.content.pm.ServiceInfo serviceInfo,
- Intent intent) {
- super(service, new ServiceBoundEvent());
- mEvent.mIntent = new SerializableParcelWrapper<>(intent);
- setService(serviceInfo);
- }
-
- /** Sets the {@link Service} which received this event. */
- public ServiceBoundEventLogger setService(android.content.pm.ServiceInfo serviceInfo) {
- mEvent.mService = ServiceInfo.builder()
- .serviceClass(serviceInfo.name)
- .build();
- return this;
- }
-
- /** Sets the {@link Intent} which was used to bind to the service. */
- public ServiceBoundEventLogger setIntent(Intent intent) {
- mEvent.mIntent = new SerializableParcelWrapper<>(intent);
- return this;
- }
-
- }
-
- protected ServiceInfo mService;
- protected SerializableParcelWrapper<Intent> mIntent;
-
- /**
- * The {@link Intent} passed into {@link Service#onBind(Intent)}.
- */
- public Intent intent() {
- if (mIntent == null) {
- return null;
- }
- return mIntent.get();
- }
-
- /** Information about the {@link Service} which received the intent. */
- public ServiceInfo service() {
- return mService;
- }
-
- @Override
- public String toString() {
- return "ServiceBoundEvent{"
- + " intent=" + intent()
- + ", service=" + mService
- + ", packageName='" + mPackageName + "'"
- + ", timestamp=" + mTimestamp
- + "}";
- }
-}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceCreatedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceCreatedEvent.java
deleted file mode 100644
index ba9dd85..0000000
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceCreatedEvent.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import android.app.Service;
-
-import androidx.annotation.CheckResult;
-
-import com.android.eventlib.Event;
-import com.android.eventlib.EventLogger;
-import com.android.eventlib.EventLogsQuery;
-import com.android.queryable.info.ServiceInfo;
-import com.android.queryable.queries.ServiceQuery;
-import com.android.queryable.queries.ServiceQueryHelper;
-
-/**
- * Event logged when {@link Service#onCreate()}
- */
-public class ServiceCreatedEvent extends Event {
-
- private static final long serialVersionUID = 1;
-
- /** Begins a query for {@link ServiceCreatedEvent} events. */
- public static ServiceCreatedEvent.ServiceCreatedEventQuery queryPackage(String packageName) {
- return new ServiceCreatedEvent.ServiceCreatedEventQuery(packageName);
- }
-
- /** {@link EventLogsQuery} for {@link ServiceCreatedEvent}. */
- public static final class ServiceCreatedEventQuery
- extends EventLogsQuery<ServiceCreatedEvent,
- ServiceCreatedEvent.ServiceCreatedEventQuery> {
-
- private static final long serialVersionUID = 1;
-
- ServiceQueryHelper<ServiceCreatedEvent.ServiceCreatedEventQuery> mService =
- new ServiceQueryHelper<>(this);
-
- private ServiceCreatedEventQuery(String packageName) {
- super(ServiceCreatedEvent.class, packageName);
- }
-
- /** Query {@link Service}. */
- @CheckResult
- public ServiceQuery<ServiceCreatedEvent.ServiceCreatedEventQuery> whereService() {
- return mService;
- }
-
- @Override
- protected boolean filter(ServiceCreatedEvent event) {
- if (!mService.matches(event.mService)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String describeQuery(String fieldName) {
- return toStringBuilder(ServiceCreatedEvent.class, this)
- .field("service", mService)
- .toString();
- }
- }
-
-
- /** Begins logging a {@link ServiceCreatedEvent}. */
- public static ServiceCreatedEvent.ServiceCreatedEventLogger logger(Service service,
- android.content.pm.ServiceInfo serviceInfo) {
- return new ServiceCreatedEvent.ServiceCreatedEventLogger(service, serviceInfo);
- }
-
- /** {@link EventLogger} for {@link ServiceCreatedEvent}. */
- public static final class ServiceCreatedEventLogger extends EventLogger<ServiceCreatedEvent> {
- private ServiceCreatedEventLogger(Service service,
- android.content.pm.ServiceInfo serviceInfo) {
- super(service, new ServiceCreatedEvent());
- setService(serviceInfo);
- }
-
- /** Sets the {@link Service} which received this event. */
- public ServiceCreatedEvent.ServiceCreatedEventLogger setService(
- android.content.pm.ServiceInfo serviceInfo) {
- mEvent.mService = ServiceInfo.builder()
- .serviceClass(serviceInfo.name)
- .build();
- return this;
- }
-
- }
-
- protected ServiceInfo mService;
-
- /** Information about the {@link Service} which received the intent. */
- public ServiceInfo service() {
- return mService;
- }
-
- @Override
- public String toString() {
- return "ServiceCreatedEvent{"
- + ", service=" + mService
- + ", packageName='" + mPackageName + "'"
- + ", timestamp=" + mTimestamp
- + "}";
- }
-}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceDestroyedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceDestroyedEvent.java
deleted file mode 100644
index ee33add..0000000
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceDestroyedEvent.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import android.app.Service;
-
-import androidx.annotation.CheckResult;
-
-import com.android.eventlib.Event;
-import com.android.eventlib.EventLogger;
-import com.android.eventlib.EventLogsQuery;
-import com.android.queryable.info.ServiceInfo;
-import com.android.queryable.queries.ServiceQuery;
-import com.android.queryable.queries.ServiceQueryHelper;
-
-/**
- * Event logged when {@link Service#onDestroy()}
- */
-public class ServiceDestroyedEvent extends Event {
-
- private static final long serialVersionUID = 1;
-
- /** Begins a query for {@link ServiceDestroyedEvent} events. */
- public static ServiceDestroyedEventQuery queryPackage(String packageName) {
- return new ServiceDestroyedEventQuery(packageName);
- }
-
- /** {@link EventLogsQuery} for {@link ServiceDestroyedEvent}. */
- public static final class ServiceDestroyedEventQuery
- extends EventLogsQuery<ServiceDestroyedEvent, ServiceDestroyedEventQuery> {
-
- private static final long serialVersionUID = 1;
-
- ServiceQueryHelper<ServiceDestroyedEventQuery> mService = new ServiceQueryHelper<>(this);
-
- private ServiceDestroyedEventQuery(String packageName) {
- super(ServiceDestroyedEvent.class, packageName);
- }
-
- /** Query {@link Service}. */
- @CheckResult
- public ServiceQuery<ServiceDestroyedEventQuery> whereService() {
- return mService;
- }
-
- @Override
- protected boolean filter(ServiceDestroyedEvent event) {
- if (!mService.matches(event.mService)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String describeQuery(String fieldName) {
- return toStringBuilder(ServiceDestroyedEvent.class, this)
- .field("service", mService)
- .toString();
- }
- }
-
-
- /** Begins logging a {@link ServiceDestroyedEvent}. */
- public static ServiceDestroyedEventLogger logger(Service service,
- android.content.pm.ServiceInfo serviceInfo) {
- return new ServiceDestroyedEventLogger(service, serviceInfo);
- }
-
- /** {@link EventLogger} for {@link ServiceDestroyedEvent}. */
- public static final class ServiceDestroyedEventLogger extends
- EventLogger<ServiceDestroyedEvent> {
- private ServiceDestroyedEventLogger(Service service,
- android.content.pm.ServiceInfo serviceInfo) {
- super(service, new ServiceDestroyedEvent());
- setService(serviceInfo);
- }
-
- /** Sets the {@link Service} which received this event. */
- public ServiceDestroyedEventLogger setService(android.content.pm.ServiceInfo serviceInfo) {
- mEvent.mService = ServiceInfo.builder()
- .serviceClass(serviceInfo.name)
- .build();
- return this;
- }
-
- }
-
- protected ServiceInfo mService;
-
- /** Information about the {@link Service} which received the intent. */
- public ServiceInfo service() {
- return mService;
- }
-
- @Override
- public String toString() {
- return "ServiceDestroyedEvent{"
- + ", service=" + mService
- + ", packageName='" + mPackageName + "'"
- + ", timestamp=" + mTimestamp
- + "}";
- }
-}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceEvents.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceEvents.java
deleted file mode 100644
index 871cc19..0000000
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceEvents.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-/**
- * Quick access to event queries about services.
- */
-public interface ServiceEvents {
-
- /**
- * Query for when an service is created.
- *
- * <p>Additional filters can be added to the returned object.
- *
- * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
- */
- ServiceCreatedEvent.ServiceCreatedEventQuery serviceCreated();
-
-
- /**
- * Query for when an service is started.
- *
- * <p>Additional filters can be added to the returned object.
- *
- * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
- */
- ServiceStartedEvent.ServiceStartedEventQuery serviceStarted();
-
- /**
- * Query for when an service is destroyed.
- *
- * <p>Additional filters can be added to the returned object.
- *
- * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
- */
- ServiceDestroyedEvent.ServiceDestroyedEventQuery serviceDestroyed();
-
- /**
- * Query for when an service is bound.
- *
- * <p>Additional filters can be added to the returned object.
- *
- * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
- */
- ServiceBoundEvent.ServiceBoundEventQuery serviceBound();
-
- /**
- * Query for when an service is unbound.
- *
- * <p>Additional filters can be added to the returned object.
- *
- * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
- */
- ServiceUnboundEvent.ServiceUnboundEventQuery serviceUnbound();
-}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceStartedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceStartedEvent.java
deleted file mode 100644
index ae66c07..0000000
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceStartedEvent.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import android.app.Service;
-import android.content.Intent;
-
-import androidx.annotation.CheckResult;
-
-import com.android.eventlib.Event;
-import com.android.eventlib.EventLogger;
-import com.android.eventlib.EventLogsQuery;
-import com.android.queryable.info.ServiceInfo;
-import com.android.queryable.queries.IntegerQueryHelper;
-import com.android.queryable.queries.IntentQuery;
-import com.android.queryable.queries.IntentQueryHelper;
-import com.android.queryable.queries.ServiceQuery;
-import com.android.queryable.queries.ServiceQueryHelper;
-import com.android.queryable.util.SerializableParcelWrapper;
-
-/**
- * Event logged when {@link Service#onStartCommand(Intent, int, int)}
- */
-public class ServiceStartedEvent extends Event {
-
- private static final long serialVersionUID = 1;
-
- /** Begins a query for {@link ServiceStartedEvent} events. */
- public static ServiceStartedEventQuery queryPackage(String packageName) {
- return new ServiceStartedEventQuery(packageName);
- }
-
- /** {@link EventLogsQuery} for {@link ServiceStartedEvent}. */
- public static final class ServiceStartedEventQuery extends EventLogsQuery<ServiceStartedEvent,
- ServiceStartedEventQuery> {
-
- private static final long serialVersionUID = 1;
-
- ServiceQueryHelper<ServiceStartedEventQuery> mService = new ServiceQueryHelper<>(this);
- IntentQueryHelper<ServiceStartedEventQuery> mIntent = new IntentQueryHelper<>(this);
- IntegerQueryHelper<ServiceStartedEventQuery> mFlags = new IntegerQueryHelper<>(this);
- IntegerQueryHelper<ServiceStartedEventQuery> mStartId = new IntegerQueryHelper<>(this);
-
- private ServiceStartedEventQuery(String packageName) {
- super(ServiceStartedEvent.class, packageName);
- }
-
- /** Query {@link Service}. */
- @CheckResult
- public ServiceQuery<ServiceStartedEventQuery> whereService() {
- return mService;
- }
-
- /**
- * Query {@link Intent} passed into {@link Service#onBind(Intent)}.
- */
- @CheckResult
- public IntentQuery<ServiceStartedEventQuery> whereIntent() {
- return mIntent;
- }
-
- /** Query {@link Service}. */
- @CheckResult
- public IntegerQueryHelper<ServiceStartedEventQuery> whereFlags() {
- return mFlags;
- }
-
- /** Query {@link Service}. */
- @CheckResult
- public IntegerQueryHelper<ServiceStartedEventQuery> whereStartId() {
- return mStartId;
- }
-
- @Override
- protected boolean filter(ServiceStartedEvent event) {
- if (!mFlags.matches(event.mFlags)) {
- return false;
- }
- if (!mStartId.matches(event.mStartId)) {
- return false;
- }
- if (!mIntent.matches(event.mIntent)) {
- return false;
- }
- if (!mService.matches(event.mService)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String describeQuery(String fieldName) {
- return toStringBuilder(ServiceStartedEvent.class, this)
- .field("flags", mFlags)
- .field("startId", mStartId)
- .field("intent", mIntent)
- .field("service", mService)
- .toString();
- }
- }
-
-
- /** Begins logging a {@link ServiceStartedEvent}. */
- public static ServiceStartedEventLogger logger(Service service,
- android.content.pm.ServiceInfo serviceInfo, Intent intent, int flags, int startId) {
- return new ServiceStartedEventLogger(service, serviceInfo, intent, flags, startId);
- }
-
- /** {@link EventLogger} for {@link ServiceStartedEvent}. */
- public static final class ServiceStartedEventLogger extends EventLogger<ServiceStartedEvent> {
- private ServiceStartedEventLogger(Service service,
- android.content.pm.ServiceInfo serviceInfo, Intent intent, int flags, int startId) {
- super(service, new ServiceStartedEvent());
- mEvent.mIntent = new SerializableParcelWrapper<>(intent);
- mEvent.mFlags = flags;
- mEvent.mStartId = startId;
- setService(serviceInfo);
- }
-
- /** Sets the {@link Service} which received this event. */
- public ServiceStartedEventLogger setService(android.content.pm.ServiceInfo serviceInfo) {
- mEvent.mService = ServiceInfo.builder()
- .serviceClass(serviceInfo.name)
- .build();
- return this;
- }
-
- /** Sets the {@link Intent} supplied to {@link android.content.Context#startService}. */
- public ServiceStartedEventLogger setIntent(Intent intent) {
- mEvent.mIntent = new SerializableParcelWrapper<>(intent);
- return this;
- }
-
- /** Sets the flags used for the start request of this service. */
- public ServiceStartedEventLogger setFlags(int flags) {
- mEvent.mFlags = flags;
- return this;
- }
-
- /** Sets the startId. */
- public ServiceStartedEventLogger setStartId(int startId) {
- mEvent.mStartId = startId;
- return this;
- }
-
- }
-
- protected ServiceInfo mService;
- protected SerializableParcelWrapper<Intent> mIntent;
- protected int mFlags;
- protected int mStartId;
-
- /**
- * The {@link Intent} passed into {@link Service#onStartCommand(Intent, int, int)}.
- */
- public Intent intent() {
- if (mIntent == null) {
- return null;
- }
- return mIntent.get();
- }
-
- /**
- * The flags passed into {@link Service#onStartCommand(Intent, int, int)}.
- */
- public int flags() {
- return mFlags;
- }
-
- /**
- * The startId passed into {@link Service#onStartCommand(Intent, int, int)}.
- */
- public int startId() {
- return mStartId;
- }
-
- /** Information about the {@link Service} which received the intent. */
- public ServiceInfo service() {
- return mService;
- }
-
- @Override
- public String toString() {
- return "ServiceStartedEvent{"
- + ", service=" + mService
- + ", flags=" + mFlags
- + ", startId=" + mStartId
- + ", packageName='" + mPackageName + "'"
- + ", timestamp=" + mTimestamp
- + "}";
- }
-}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceUnboundEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceUnboundEvent.java
deleted file mode 100644
index 319633d..0000000
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceUnboundEvent.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import android.app.Service;
-import android.content.Intent;
-
-import androidx.annotation.CheckResult;
-
-import com.android.eventlib.Event;
-import com.android.eventlib.EventLogger;
-import com.android.eventlib.EventLogsQuery;
-import com.android.queryable.info.ServiceInfo;
-import com.android.queryable.queries.IntentQuery;
-import com.android.queryable.queries.IntentQueryHelper;
-import com.android.queryable.queries.ServiceQuery;
-import com.android.queryable.queries.ServiceQueryHelper;
-import com.android.queryable.util.SerializableParcelWrapper;
-
-/**
- * Event logged when {@link Service#onUnbind(Intent)}
- */
-public class ServiceUnboundEvent extends Event {
-
- private static final long serialVersionUID = 1;
-
- /** Begins a query for {@link ServiceUnboundEvent} events. */
- public static ServiceUnboundEventQuery queryPackage(String packageName) {
- return new ServiceUnboundEventQuery(packageName);
- }
-
- /** {@link EventLogsQuery} for {@link ServiceUnboundEvent}. */
- public static final class ServiceUnboundEventQuery
- extends EventLogsQuery<ServiceUnboundEvent,
- ServiceUnboundEvent.ServiceUnboundEventQuery> {
-
- private static final long serialVersionUID = 1;
-
- ServiceQueryHelper<ServiceUnboundEvent.ServiceUnboundEventQuery> mService =
- new ServiceQueryHelper<>(this);
- IntentQueryHelper<ServiceUnboundEvent.ServiceUnboundEventQuery> mIntent =
- new IntentQueryHelper<>(this);
-
- private ServiceUnboundEventQuery(String packageName) {
- super(ServiceUnboundEvent.class, packageName);
- }
-
- /**
- * Query {@link Intent} passed into {@link Service#onUnbind(Intent)}.
- */
- @CheckResult
- public IntentQuery<ServiceUnboundEventQuery> whereIntent() {
- return mIntent;
- }
-
- /** Query {@link Service}. */
- @CheckResult
- public ServiceQuery<ServiceUnboundEventQuery> whereService() {
- return mService;
- }
-
- @Override
- protected boolean filter(ServiceUnboundEvent event) {
- if (!mIntent.matches(event.mIntent)) {
- return false;
- }
- if (!mService.matches(event.mService)) {
- return false;
- }
- return true;
- }
-
- @Override
- public String describeQuery(String fieldName) {
- return toStringBuilder(ServiceUnboundEvent.class, this)
- .field("intent", mIntent)
- .field("service", mService)
- .toString();
- }
- }
-
-
- /** Begins logging a {@link ServiceUnboundEvent}. */
- public static ServiceUnboundEventLogger logger(Service service,
- android.content.pm.ServiceInfo serviceInfo, Intent intent) {
- return new ServiceUnboundEventLogger(service, serviceInfo, intent);
- }
-
- /** {@link EventLogger} for {@link ServiceUnboundEvent}. */
- public static final class ServiceUnboundEventLogger extends EventLogger<ServiceUnboundEvent> {
-
- private ServiceUnboundEventLogger(Service service,
- android.content.pm.ServiceInfo serviceInfo,
- Intent intent) {
- super(service, new ServiceUnboundEvent());
- mEvent.mIntent = new SerializableParcelWrapper<>(intent);
- setService(serviceInfo);
- }
-
- /** Sets the {@link Service} which received this event. */
- public ServiceUnboundEventLogger setService(android.content.pm.ServiceInfo serviceInfo) {
- mEvent.mService = ServiceInfo.builder()
- .serviceClass(serviceInfo.name)
- .build();
- return this;
- }
-
- /** Sets the {@link Intent} that was used to bind to the service. */
- public ServiceUnboundEventLogger setIntent(Intent intent) {
- mEvent.mIntent = new SerializableParcelWrapper<>(intent);
- return this;
- }
-
- }
-
- protected ServiceInfo mService;
- protected SerializableParcelWrapper<Intent> mIntent;
-
- /**
- * The {@link Intent} passed into {@link Service#onUnbind(Intent)}.
- */
- public Intent intent() {
- if (mIntent == null) {
- return null;
- }
- return mIntent.get();
- }
-
- /** Information about the {@link Service} which received the intent. */
- public ServiceInfo service() {
- return mService;
- }
-
- @Override
- public String toString() {
- return "ServiceUnboundEvent{"
- + " intent=" + intent()
- + ", service=" + mService
- + ", packageName='" + mPackageName + "'"
- + ", timestamp=" + mTimestamp
- + "}";
- }
-}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibAppComponentFactory.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibAppComponentFactory.java
index 9d304b9..ed2bcd9 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibAppComponentFactory.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibAppComponentFactory.java
@@ -18,7 +18,6 @@
import android.app.Activity;
import android.app.AppComponentFactory;
-import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Intent;
import android.util.Log;
@@ -64,21 +63,4 @@
return receiver;
}
}
-
- @Override
- public Service instantiateService(ClassLoader classLoader, String className, Intent intent)
- throws InstantiationException, IllegalAccessException, ClassNotFoundException {
- try {
- return super.instantiateService(classLoader, className, intent);
- } catch (ClassNotFoundException e) {
- Log.d(LOG_TAG, "Service class (" + className
- + ") not found, routing to EventLibService");
-
- EventLibService service = (EventLibService)
- super.instantiateService(
- classLoader, EventLibService.class.getName(), intent);
- service.setOverrideServiceClassName(className);
- return service;
- }
- }
}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibService.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibService.java
deleted file mode 100644
index af961e7..0000000
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibService.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.premade;
-
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.content.res.Configuration;
-import android.os.Binder;
-import android.os.IBinder;
-
-import com.android.eventlib.events.services.ServiceBoundEvent;
-import com.android.eventlib.events.services.ServiceCreatedEvent;
-import com.android.eventlib.events.services.ServiceDestroyedEvent;
-import com.android.eventlib.events.services.ServiceStartedEvent;
-import com.android.eventlib.events.services.ServiceUnboundEvent;
-
-/**
- * An {@link Service} which logs events for all lifecycle events.
- */
-public class EventLibService extends Service {
-
- private String mOverrideServiceClassName;
- private final IBinder mBinder = new Binder();
-
- public void setOverrideServiceClassName(String overrideServiceClassName) {
- mOverrideServiceClassName = overrideServiceClassName;
- }
-
- /**
- * Gets the class name of this service.
- *
- * <p>If the class name has been overridden, that will be returned instead.
- */
- public String getClassName() {
- if (mOverrideServiceClassName != null) {
- return mOverrideServiceClassName;
- }
-
- return EventLibService.class.getName();
- }
-
- public ComponentName getComponentName() {
- return new ComponentName(getApplication().getPackageName(), getClassName());
- }
-
- private ServiceInfo mServiceInfo = null;
-
- private ServiceInfo serviceInfo() {
- if (mServiceInfo != null) {
- return mServiceInfo;
- }
-
- PackageManager packageManager = getPackageManager();
- try {
- mServiceInfo = packageManager.getServiceInfo(getComponentName(), /* flags= */ 0);
- } catch (PackageManager.NameNotFoundException e) {
- throw new AssertionError("Cannot find service", e);
- }
-
- return mServiceInfo;
- }
-
- @Override
- public void onCreate() {
- ServiceCreatedEvent.logger(this, serviceInfo()).log();
- }
-
- @Override
- public int onStartCommand(Intent intent, int flags, int startId) {
- ServiceStartedEvent.logger(this, serviceInfo(), intent, flags, startId).log();
- return super.onStartCommand(intent, flags, startId);
- }
-
- @Override
- public void onDestroy() {
- ServiceDestroyedEvent.logger(this, serviceInfo()).log();
- }
-
- @Override
- public void onConfigurationChanged(Configuration newConfig) {
- }
-
- @Override
- public void onLowMemory() {
- }
-
- @Override
- public void onTrimMemory(int level) {
- }
-
- @Override
- public IBinder onBind(Intent intent) {
- ServiceBoundEvent.logger(this, serviceInfo(), intent).log();
- return mBinder;
- }
-
- @Override
- public boolean onUnbind(Intent intent) {
- ServiceUnboundEvent.logger(this, serviceInfo(), intent).log();
- return super.onUnbind(intent);
- }
-
- @Override
- public void onRebind(Intent intent) {
- }
-
- @Override
- public void onTaskRemoved(Intent rootIntent) {
- }
-}
diff --git a/common/device-side/bedstead/eventlib/src/test/AndroidManifest.xml b/common/device-side/bedstead/eventlib/src/test/AndroidManifest.xml
index 5a3d243..68b4c3d 100644
--- a/common/device-side/bedstead/eventlib/src/test/AndroidManifest.xml
+++ b/common/device-side/bedstead/eventlib/src/test/AndroidManifest.xml
@@ -52,8 +52,6 @@
</intent-filter>
</receiver>
- <service android:name="com.android.generatedEventLibService"/>
-
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.eventlib.test"
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceBoundEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceBoundEventTest.java
deleted file mode 100644
index a3b335f..0000000
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceBoundEventTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-
-//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
-@RunWith(JUnit4.class)
-public class ServiceBoundEventTest {}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceCreatedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceCreatedEventTest.java
deleted file mode 100644
index 3547be8..0000000
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceCreatedEventTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
-@RunWith(JUnit4.class)
-public class ServiceCreatedEventTest {
-}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceDestroyedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceDestroyedEventTest.java
deleted file mode 100644
index 590c3fe..0000000
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceDestroyedEventTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
-@RunWith(JUnit4.class)
-public class ServiceDestroyedEventTest {
-}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceStartedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceStartedEventTest.java
deleted file mode 100644
index de67058..0000000
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceStartedEventTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
-@RunWith(JUnit4.class)
-public class ServiceStartedEventTest {
-}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceUnboundEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceUnboundEventTest.java
deleted file mode 100644
index 90c0f72..0000000
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceUnboundEventTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.events.services;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
-@RunWith(JUnit4.class)
-public class ServiceUnboundEventTest {
-}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibAppComponentFactoryTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibAppComponentFactoryTest.java
index 11539c0..b8f688d 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibAppComponentFactoryTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibAppComponentFactoryTest.java
@@ -26,7 +26,6 @@
import com.android.eventlib.EventLogs;
import com.android.eventlib.events.activities.ActivityCreatedEvent;
import com.android.eventlib.events.broadcastreceivers.BroadcastReceivedEvent;
-import com.android.eventlib.events.services.ServiceCreatedEvent;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -50,10 +49,6 @@
private static final String GENERATED_BROADCAST_RECEIVER_ACTION =
"com.android.eventlib.GENERATED_BROADCAST_RECEIVER";
- // This must exist as a <service> in AndroidManifest.xml
- private static final String GENERATED_SERVICE_CLASS_NAME =
- "com.android.generatedEventLibService";
-
private static final Context sContext =
TestApis.context().instrumentedContext();
@@ -84,19 +79,4 @@
assertThat(eventLogs.poll()).isNotNull();
}
- @Test
- public void startService_serviceDoesNotExist_startsLoggingService() {
- Intent intent = new Intent();
- intent.setComponent(new ComponentName(sContext.getPackageName(),
- GENERATED_SERVICE_CLASS_NAME));
-
- sContext.startService(intent);
-
- EventLogs<ServiceCreatedEvent> eventLogs =
- ServiceCreatedEvent.queryPackage(sContext.getPackageName())
- .whereService().serviceClass().className()
- .isEqualTo(GENERATED_SERVICE_CLASS_NAME);
- assertThat(eventLogs.poll()).isNotNull();
- }
-
}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibServiceTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibServiceTest.java
deleted file mode 100644
index 1877307..0000000
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibServiceTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.eventlib.premade;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.android.bedstead.nene.TestApis;
-import com.android.eventlib.EventLogs;
-import com.android.eventlib.events.services.ServiceCreatedEvent;
-
-import org.junit.Before;
-import org.junit.Test;
-
-//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
-public class EventLibServiceTest {
-
- // This must exist as a <service> in AndroidManifest.xml
- private static final String GENERATED_SERVICE_CLASS_NAME =
- "com.android.generatedEventLibService";
-
- private static final Instrumentation sInstrumentation =
- InstrumentationRegistry.getInstrumentation();
-
- private static final Context sContext = TestApis.context().instrumentedContext();
-
- @Before
- public void setUp() {
- EventLogs.resetLogs();
- }
-
- @Test
- public void launchEventLibService_logsServiceCreatedEvent() {
- Intent intent = new Intent();
- intent.setPackage(sContext.getPackageName());
- intent.setClassName(sContext.getPackageName(), EventLibService.class.getName());
- sContext.startService(intent);
-
- EventLogs<ServiceCreatedEvent> eventLogs = ServiceCreatedEvent
- .queryPackage(sContext.getPackageName())
- .whereService().serviceClass().isSameClassAs(EventLibService.class);
- assertThat(eventLogs.poll()).isNotNull();
- }
-
- @Test
- public void launchEventLibService_withGeneratedServiceClass_logsServiceCreatedEventWithCorrectClassName() {
- Intent intent = new Intent();
- intent.setPackage(sContext.getPackageName());
- intent.setClassName(sContext.getPackageName(), GENERATED_SERVICE_CLASS_NAME);
- sContext.startService(intent);
-
- EventLogs<ServiceCreatedEvent> eventLogs = ServiceCreatedEvent
- .queryPackage(sContext.getPackageName())
- .whereService().serviceClass().className().isEqualTo(GENERATED_SERVICE_CLASS_NAME);
- assertThat(eventLogs.poll()).isNotNull();
- }
-}
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
index be6f1cd..2e2269e 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
@@ -53,12 +53,6 @@
import com.android.eventlib.events.deviceadminreceivers.DeviceAdminUserStartedEvent;
import com.android.eventlib.events.deviceadminreceivers.DeviceAdminUserStoppedEvent;
import com.android.eventlib.events.deviceadminreceivers.DeviceAdminUserSwitchedEvent;
-import com.android.eventlib.events.services.ServiceBoundEvent;
-import com.android.eventlib.events.services.ServiceCreatedEvent;
-import com.android.eventlib.events.services.ServiceDestroyedEvent;
-import com.android.eventlib.events.services.ServiceEvents;
-import com.android.eventlib.events.services.ServiceStartedEvent;
-import com.android.eventlib.events.services.ServiceUnboundEvent;
/**
* Quick access to events on this test app.
@@ -68,7 +62,7 @@
* <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
*/
public class TestAppEvents implements ActivityEvents, BroadcastReceiverEvents,
- DeviceAdminReceiverEvents, ServiceEvents {
+ DeviceAdminReceiverEvents {
private final TestAppInstanceReference mTestApp;
@@ -313,39 +307,4 @@
mTestApp.testApp().packageName())
.onUser(mTestApp.user());
}
-
- @Override
- public ServiceBoundEvent.ServiceBoundEventQuery serviceBound() {
- return ServiceBoundEvent.queryPackage(
- mTestApp.testApp().packageName())
- .onUser(mTestApp.user());
- }
-
- @Override
- public ServiceUnboundEvent.ServiceUnboundEventQuery serviceUnbound() {
- return ServiceUnboundEvent.queryPackage(
- mTestApp.testApp().packageName())
- .onUser(mTestApp.user());
- }
-
- @Override
- public ServiceCreatedEvent.ServiceCreatedEventQuery serviceCreated() {
- return ServiceCreatedEvent.queryPackage(
- mTestApp.testApp().packageName())
- .onUser(mTestApp.user());
- }
-
- @Override
- public ServiceStartedEvent.ServiceStartedEventQuery serviceStarted() {
- return ServiceStartedEvent.queryPackage(
- mTestApp.testApp().packageName())
- .onUser(mTestApp.user());
- }
-
- @Override
- public ServiceDestroyedEvent.ServiceDestroyedEventQuery serviceDestroyed() {
- return ServiceDestroyedEvent.queryPackage(
- mTestApp.testApp().packageName())
- .onUser(mTestApp.user());
- }
}
diff --git a/common/device-side/bedstead/testapp/src/test/AndroidManifest.xml b/common/device-side/bedstead/testapp/src/test/AndroidManifest.xml
index 6788155..9920d90 100644
--- a/common/device-side/bedstead/testapp/src/test/AndroidManifest.xml
+++ b/common/device-side/bedstead/testapp/src/test/AndroidManifest.xml
@@ -32,8 +32,6 @@
<action android:name="com.android.testapp.GENERATED_BROADCAST_RECEIVER"/>
</intent-filter>
</receiver>
-
- <service android:name="com.android.GeneratedTestAppService" />
</application>
<uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27"/>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
diff --git a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppAppComponentFactoryTest.java b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppAppComponentFactoryTest.java
index 3d11f4e..bbfc2f4 100644
--- a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppAppComponentFactoryTest.java
+++ b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppAppComponentFactoryTest.java
@@ -28,7 +28,6 @@
import com.android.bedstead.nene.TestApis;
import com.android.eventlib.events.activities.ActivityCreatedEvent;
import com.android.eventlib.events.broadcastreceivers.BroadcastReceivedEvent;
-import com.android.eventlib.events.services.ServiceCreatedEvent;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -52,10 +51,6 @@
private static final String GENERATED_BROADCAST_RECEIVER_ACTION =
"com.android.testapp.GENERATED_BROADCAST_RECEIVER";
- // This must exist as a <service> in AndroidManifest.xml
- private static final String GENERATED_SERVICE_CLASS_NAME =
- "com.android.GeneratedTestAppService";
-
private static final Context sContext =
TestApis.context().instrumentedContext();
@@ -84,17 +79,4 @@
.whereBroadcastReceiver().receiverClass().className()
.isEqualTo(GENERATED_RECEIVER_CLASS_NAME)).eventOccurred();
}
-
- @Test
- public void startService_serviceDoesNotExist_startsLoggingService() {
- Intent intent = new Intent();
- intent.setComponent(new ComponentName(sContext.getPackageName(),
- GENERATED_SERVICE_CLASS_NAME));
-
- sContext.startService(intent);
-
- assertThat(ServiceCreatedEvent.queryPackage(sContext.getPackageName())
- .whereService().serviceClass().className()
- .isEqualTo(GENERATED_SERVICE_CLASS_NAME)).eventOccurred();
- }
}
diff --git a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAccountAuthenticatorService.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAccountAuthenticatorService.java
index 9583703..8ab57f3 100644
--- a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAccountAuthenticatorService.java
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAccountAuthenticatorService.java
@@ -20,15 +20,13 @@
import android.content.Intent;
import android.os.IBinder;
-import com.android.eventlib.premade.EventLibService;
-
+// TODO(b/199143717): Create EventLibService
/**
* A single-purpose {@link Service} to allow test apps to act as account authenticators.
*/
-public final class TestAppAccountAuthenticatorService extends EventLibService {
+public final class TestAppAccountAuthenticatorService extends Service {
@Override
public IBinder onBind(Intent intent) {
- super.onBind(intent);
return TestAppAccountAuthenticator.getAuthenticator(this).getIBinder();
}
}
diff --git a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
index 82eca41..98cb277 100644
--- a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
@@ -32,7 +32,6 @@
import android.util.Log;
import com.android.bedstead.testapp.processor.annotations.TestAppReceiver;
-import com.android.eventlib.premade.EventLibService;
/**
* An {@link AppComponentFactory} which redirects invalid class names to premade TestApp classes.
@@ -111,15 +110,9 @@
classLoader,
TestAppAccountAuthenticatorService.class.getName(),
intent);
+ } else {
+ throw e;
}
-
- Log.d(LOG_TAG,
- "Service class (" + className + ") not found, routing to EventLibService");
- EventLibService service =
- (EventLibService) super.instantiateService(
- classLoader, EventLibService.class.getName(), intent);
- service.setOverrideServiceClassName(className);
- return service;
}
}
}