Revert "[DLC vNext] Create StatsLogger helper class and add tests"
This reverts commit e6704ba3f3a653ea98728ca805d7dfbf400d640b.
Reason for revert: Experimenting without this CL because this CL may be the culprit of some recent test failures.
Bug: b/308908722, b/308898881, b/308896144
Change-Id: Ie6a6d83638d2e70e385db01c7e8abc8ed2665efa
diff --git a/DeviceLockController/src/com/android/devicelockcontroller/DeviceLockControllerApplication.java b/DeviceLockController/src/com/android/devicelockcontroller/DeviceLockControllerApplication.java
index e70f784..dfd2be1 100644
--- a/DeviceLockController/src/com/android/devicelockcontroller/DeviceLockControllerApplication.java
+++ b/DeviceLockController/src/com/android/devicelockcontroller/DeviceLockControllerApplication.java
@@ -18,7 +18,6 @@
import android.app.Application;
import android.content.Context;
-import android.util.StatsLog;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
@@ -37,9 +36,6 @@
import com.android.devicelockcontroller.schedule.DeviceLockControllerScheduler;
import com.android.devicelockcontroller.schedule.DeviceLockControllerSchedulerImpl;
import com.android.devicelockcontroller.schedule.DeviceLockControllerSchedulerProvider;
-import com.android.devicelockcontroller.stats.StatsLogger;
-import com.android.devicelockcontroller.stats.StatsLoggerImpl;
-import com.android.devicelockcontroller.stats.StatsLoggerProvider;
import com.android.devicelockcontroller.util.LogUtil;
import com.google.common.util.concurrent.Futures;
@@ -48,13 +44,12 @@
/**
* Application class for Device Lock Controller.
*/
-public abstract class DeviceLockControllerApplication extends Application implements
+public class DeviceLockControllerApplication extends Application implements
PolicyObjectsInterface,
Configuration.Provider,
DeviceLockControllerSchedulerProvider,
FcmRegistrationTokenProvider,
- PlayInstallPackageTaskClassProvider,
- StatsLoggerProvider {
+ PlayInstallPackageTaskClassProvider {
private static final String TAG = "DeviceLockControllerApplication";
private static Context sApplicationContext;
@@ -64,8 +59,6 @@
private FinalizationController mFinalizationController;
@GuardedBy("this")
private DeviceLockControllerScheduler mDeviceLockControllerScheduler;
- @GuardedBy("this")
- private StatsLogger mStatsLogger;
@Override
public void onCreate() {
@@ -101,14 +94,6 @@
}
@Override
- public synchronized StatsLogger getStatsLogger() {
- if (null == mStatsLogger) {
- mStatsLogger = new StatsLoggerImpl();
- }
- return mStatsLogger;
- }
-
- @Override
public synchronized void destroyObjects() {
mProvisionStateController = null;
mFinalizationController = null;
diff --git a/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/DeviceCheckInWorker.java b/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/DeviceCheckInWorker.java
index 1af6157..c7dce97 100644
--- a/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/DeviceCheckInWorker.java
+++ b/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/DeviceCheckInWorker.java
@@ -22,14 +22,13 @@
import androidx.annotation.VisibleForTesting;
import androidx.work.WorkerParameters;
+import com.android.devicelockcontroller.DevicelockStatsLog;
import com.android.devicelockcontroller.FcmRegistrationTokenProvider;
import com.android.devicelockcontroller.provision.grpc.DeviceCheckInClient;
import com.android.devicelockcontroller.provision.grpc.GetDeviceCheckInStatusGrpcResponse;
import com.android.devicelockcontroller.schedule.DeviceLockControllerScheduler;
import com.android.devicelockcontroller.schedule.DeviceLockControllerSchedulerProvider;
-import com.android.devicelockcontroller.stats.StatsLoggerProvider;
import com.android.devicelockcontroller.util.LogUtil;
-import com.android.devicelockcontroller.stats.StatsLogger;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -37,6 +36,8 @@
import java.time.Duration;
+import static com.android.devicelockcontroller.DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__GET_DEVICE_CHECK_IN_STATUS;
+
/**
* A worker class dedicated to execute the check-in operation for device lock program.
*/
@@ -44,8 +45,6 @@
private final AbstractDeviceCheckInHelper mCheckInHelper;
- private final StatsLogger mStatsLogger;
-
@VisibleForTesting
static final Duration RETRY_ON_FAILURE_DELAY = Duration.ofDays(1);
@@ -60,9 +59,6 @@
ListeningExecutorService executorService) {
super(context, workerParameters, client, executorService);
mCheckInHelper = helper;
- StatsLoggerProvider loggerProvider =
- (StatsLoggerProvider) context.getApplicationContext();
- mStatsLogger = loggerProvider.getStatsLogger();
}
@NonNull
@@ -95,7 +91,10 @@
return Result.retry();
}
if (response.isSuccessful()) {
- mStatsLogger.logGetDeviceCheckInStatus();
+ DevicelockStatsLog.write(
+ DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED,
+ DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__GET_DEVICE_CHECK_IN_STATUS
+ );
return mCheckInHelper.handleGetDeviceCheckInStatusResponse(response,
scheduler)
? Result.success()
diff --git a/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/PauseProvisioningWorker.java b/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/PauseProvisioningWorker.java
index 1e3e434..22725f0 100644
--- a/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/PauseProvisioningWorker.java
+++ b/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/PauseProvisioningWorker.java
@@ -16,6 +16,7 @@
package com.android.devicelockcontroller.provision.worker;
+import static com.android.devicelockcontroller.DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__PAUSE_DEVICE_PROVISIONING;
import static com.android.devicelockcontroller.common.DeviceLockConstants.REASON_UNSPECIFIED;
import static com.android.devicelockcontroller.common.DeviceLockConstants.USER_DEFERRED_DEVICE_PROVISIONING;
@@ -31,11 +32,10 @@
import androidx.work.WorkManager;
import androidx.work.WorkerParameters;
+import com.android.devicelockcontroller.DevicelockStatsLog;
import com.android.devicelockcontroller.provision.grpc.DeviceCheckInClient;
import com.android.devicelockcontroller.provision.grpc.PauseDeviceProvisioningGrpcResponse;
-import com.android.devicelockcontroller.stats.StatsLoggerProvider;
import com.android.devicelockcontroller.util.LogUtil;
-import com.android.devicelockcontroller.stats.StatsLogger;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -52,8 +52,6 @@
public static final String REPORT_PROVISION_PAUSED_BY_USER_WORK =
"report-provision-paused-by-user";
- private final StatsLogger mStatsLogger;
-
/**
* Report provision has been paused by user to backend server by running a work item.
*/
@@ -75,16 +73,13 @@
public PauseProvisioningWorker(@NonNull Context context,
@NonNull WorkerParameters workerParams, ListeningExecutorService executorService) {
- this(context, workerParams, null, executorService);
+ super(context, workerParams, null, executorService);
}
@VisibleForTesting
PauseProvisioningWorker(@NonNull Context context, @NonNull WorkerParameters workerParams,
DeviceCheckInClient client, ListeningExecutorService executorService) {
super(context, workerParams, client, executorService);
- StatsLoggerProvider loggerProvider =
- (StatsLoggerProvider) context.getApplicationContext();
- mStatsLogger = loggerProvider.getStatsLogger();
}
@NonNull
@@ -98,7 +93,10 @@
return Result.retry();
}
if (response.isSuccessful()) {
- mStatsLogger.logPauseDeviceProvisioning();
+ DevicelockStatsLog.write(
+ DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED,
+ DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__PAUSE_DEVICE_PROVISIONING
+ );
return Result.success();
}
LogUtil.w(TAG, "Pause provisioning request failed: " + response);
diff --git a/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/ReportDeviceProvisionStateWorker.java b/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/ReportDeviceProvisionStateWorker.java
index 37cf6dc..3b1c92f 100644
--- a/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/ReportDeviceProvisionStateWorker.java
+++ b/DeviceLockController/src/com/android/devicelockcontroller/provision/worker/ReportDeviceProvisionStateWorker.java
@@ -16,6 +16,9 @@
package com.android.devicelockcontroller.provision.worker;
+import static com.android.devicelockcontroller.DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__REPORT_DEVICE_PROVISION_STATE;
+import static com.android.devicelockcontroller.DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__REPORT_DEVICE_PROVISIONING_COMPLETE;
+
import android.content.Context;
import androidx.annotation.NonNull;
@@ -28,17 +31,16 @@
import androidx.work.WorkManager;
import androidx.work.WorkerParameters;
+import com.android.devicelockcontroller.DevicelockStatsLog;
import com.android.devicelockcontroller.common.DeviceLockConstants.DeviceProvisionState;
import com.android.devicelockcontroller.common.DeviceLockConstants.ProvisionFailureReason;
import com.android.devicelockcontroller.provision.grpc.DeviceCheckInClient;
import com.android.devicelockcontroller.provision.grpc.ReportDeviceProvisionStateGrpcResponse;
import com.android.devicelockcontroller.schedule.DeviceLockControllerScheduler;
import com.android.devicelockcontroller.schedule.DeviceLockControllerSchedulerProvider;
-import com.android.devicelockcontroller.stats.StatsLoggerProvider;
import com.android.devicelockcontroller.storage.GlobalParametersClient;
import com.android.devicelockcontroller.storage.UserParameters;
import com.android.devicelockcontroller.util.LogUtil;
-import com.android.devicelockcontroller.stats.StatsLogger;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -52,8 +54,6 @@
public static final String KEY_PROVISION_FAILURE_REASON = "provision-failure-reason";
public static final String REPORT_PROVISION_STATE_WORK_NAME = "report-provision-state";
- private final StatsLogger mStatsLogger;
-
/**
* Report provision failure and get next failed step
*/
@@ -108,9 +108,6 @@
@NonNull WorkerParameters workerParams, DeviceCheckInClient client,
ListeningExecutorService executorService) {
super(context, workerParams, client, executorService);
- StatsLoggerProvider loggerProvider =
- (StatsLoggerProvider) context.getApplicationContext();
- mStatsLogger = loggerProvider.getStatsLogger();
}
@NonNull
@@ -148,11 +145,12 @@
Futures.getUnchecked(globalParametersClient.setLastReceivedProvisionState(nextState));
scheduler.scheduleNextProvisionFailedStepAlarm(
shouldRunNextStepImmediately(Futures.getDone(lastState), nextState));
- if (DeviceProvisionState.PROVISION_STATE_SUCCESS == nextState) {
- mStatsLogger.logReportDeviceProvisioningComplete();
- } else {
- mStatsLogger.logReportDeviceProvisionState();
- }
+ DevicelockStatsLog.write(
+ DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED,
+ nextState == DeviceProvisionState.PROVISION_STATE_SUCCESS
+ ? DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__REPORT_DEVICE_PROVISIONING_COMPLETE
+ : DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__REPORT_DEVICE_PROVISION_STATE
+ );
return Result.success();
}, mExecutorService);
}
diff --git a/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLogger.java b/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLogger.java
deleted file mode 100644
index 3c4325c..0000000
--- a/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLogger.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2023 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.devicelockcontroller.stats;
-import com.android.devicelockcontroller.DevicelockStatsLog;
-
-/**
- * Utility class wrapping operations related to Statistics.
- *
- * Please refer to {@link DevicelockStatsLog} class and
- * stats/atoms/devicelock/devicelock_extension_atoms.proto for more information.
- */
-public interface StatsLogger {
- /**
- * Log to statistics the event of successfully getting device check in status from the server.
- */
- void logGetDeviceCheckInStatus();
-
- /**
- * Log to statistics the event of successfully pausing the device provisioning.
- */
- void logPauseDeviceProvisioning();
-
- /**
- * Log to statistics the event of successfully completing the device provisioning.
- */
- void logReportDeviceProvisioningComplete();
-
- /**
- * Log to statistics the event of successfully reporting the device provisioning state to the
- * server.
- */
- void logReportDeviceProvisionState();
-}
diff --git a/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLoggerImpl.java b/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLoggerImpl.java
deleted file mode 100644
index 04f1e21..0000000
--- a/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLoggerImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2023 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.devicelockcontroller.stats;
-
-import static com.android.devicelockcontroller.DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__GET_DEVICE_CHECK_IN_STATUS;
-import static com.android.devicelockcontroller.DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__PAUSE_DEVICE_PROVISIONING;
-import static com.android.devicelockcontroller.DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__REPORT_DEVICE_PROVISIONING_COMPLETE;
-import static com.android.devicelockcontroller.DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__REPORT_DEVICE_PROVISION_STATE;
-
-import com.android.devicelockcontroller.DevicelockStatsLog;
-
-public final class StatsLoggerImpl implements StatsLogger{
- @Override
- public void logGetDeviceCheckInStatus() {
- DevicelockStatsLog.write(DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED,
- DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__GET_DEVICE_CHECK_IN_STATUS);
- }
-
- @Override
- public void logPauseDeviceProvisioning() {
- DevicelockStatsLog.write(DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED,
- DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__PAUSE_DEVICE_PROVISIONING);
- }
-
- @Override
- public void logReportDeviceProvisioningComplete() {
- DevicelockStatsLog.write(DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED,
- DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__REPORT_DEVICE_PROVISIONING_COMPLETE);
- }
-
- @Override
- public void logReportDeviceProvisionState() {
- DevicelockStatsLog.write(DevicelockStatsLog.DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED,
- DEVICE_LOCK_CHECK_IN_REQUEST_REPORTED__TYPE__REPORT_DEVICE_PROVISION_STATE);
- }
-}
diff --git a/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLoggerProvider.java b/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLoggerProvider.java
deleted file mode 100644
index 28831c8..0000000
--- a/DeviceLockController/src/com/android/devicelockcontroller/stats/StatsLoggerProvider.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2023 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.devicelockcontroller.stats;
-
-/**
- * Interface for getting {@link StatsLogger}
- */
-public interface StatsLoggerProvider {
- StatsLogger getStatsLogger();
-}
diff --git a/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/TestDeviceLockControllerApplication.java b/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/TestDeviceLockControllerApplication.java
index 53ea5a0..c0bd66b 100644
--- a/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/TestDeviceLockControllerApplication.java
+++ b/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/TestDeviceLockControllerApplication.java
@@ -22,7 +22,6 @@
import android.app.Application;
import android.content.Context;
-import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.work.ListenableWorker;
@@ -35,8 +34,6 @@
import com.android.devicelockcontroller.policy.ProvisionStateController;
import com.android.devicelockcontroller.schedule.DeviceLockControllerScheduler;
import com.android.devicelockcontroller.schedule.DeviceLockControllerSchedulerProvider;
-import com.android.devicelockcontroller.stats.StatsLogger;
-import com.android.devicelockcontroller.stats.StatsLoggerProvider;
import com.android.devicelockcontroller.storage.GlobalParametersClient;
import com.android.devicelockcontroller.storage.GlobalParametersService;
import com.android.devicelockcontroller.storage.SetupParametersClient;
@@ -59,8 +56,7 @@
TestLifecycleApplication,
DeviceLockControllerSchedulerProvider,
FcmRegistrationTokenProvider,
- PlayInstallPackageTaskClassProvider,
- StatsLoggerProvider {
+ PlayInstallPackageTaskClassProvider {
private DevicePolicyController mPolicyController;
private DeviceStateController mStateController;
@@ -69,7 +65,6 @@
private DeviceLockControllerScheduler mDeviceLockControllerScheduler;
private SetupParametersClient mSetupParametersClient;
private GlobalParametersClient mGlobalParametersClient;
- private StatsLogger mStatsLogger;
@Override
public DeviceStateController getDeviceStateController() {
@@ -108,14 +103,6 @@
}
@Override
- public synchronized StatsLogger getStatsLogger() {
- if (null == mStatsLogger) {
- mStatsLogger = mock(StatsLogger.class);
- }
- return mStatsLogger;
- }
-
- @Override
@NonNull
public ListenableFuture<String> getFcmRegistrationToken() {
return Futures.immediateFuture(null);
diff --git a/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/DeviceCheckInWorkerTest.java b/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/DeviceCheckInWorkerTest.java
index 61f3adb..bd73316 100644
--- a/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/DeviceCheckInWorkerTest.java
+++ b/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/DeviceCheckInWorkerTest.java
@@ -40,7 +40,6 @@
import androidx.work.WorkerParameters;
import androidx.work.testing.TestListenableWorkerBuilder;
-import com.android.devicelockcontroller.DeviceLockControllerApplication;
import com.android.devicelockcontroller.TestDeviceLockControllerApplication;
import com.android.devicelockcontroller.common.DeviceId;
import com.android.devicelockcontroller.provision.grpc.DeviceCheckInClient;
@@ -55,14 +54,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-
-import com.android.devicelockcontroller.stats.StatsLogger;
-import com.android.devicelockcontroller.stats.StatsLoggerProvider;
-
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
public class DeviceCheckInWorkerTest {
@@ -79,7 +73,6 @@
private DeviceCheckInClient mClient;
@Mock
private GetDeviceCheckInStatusGrpcResponse mResponse;
- private StatsLogger mStatsLogger;
private DeviceCheckInWorker mWorker;
@Before
@@ -102,14 +95,10 @@
: null;
}
}).build();
- StatsLoggerProvider loggerProvider =
- (StatsLoggerProvider) context.getApplicationContext();
- mStatsLogger = loggerProvider.getStatsLogger();
}
-
@Test
- public void checkIn_allInfoAvailable_checkInResponseSuccessfulAndHandleable_successAndLogged() {
+ public void checkIn_allInfoAvailable_checkInResponseSuccessfulAndHandleable_succeeded() {
// GIVEN all device info available
setDeviceIdAvailability(/* isAvailable= */ true);
setCarrierInfoAvailability(/* isAvailable= */ true);
@@ -122,12 +111,10 @@
// THEN work succeeded
assertThat(result).isEqualTo(Result.success());
- // THEN check in request was logged
- verify(mStatsLogger).logGetDeviceCheckInStatus();
}
@Test
- public void checkIn_allInfoAvailable_checkInResponseSuccessfulButNotHandleable_retryAndLogged() {
+ public void checkIn_allInfoAvailable_checkInResponseSuccessfulButNotHandleable_retry() {
// GIVEN all device info available
setDeviceIdAvailability(/* isAvailable= */ true);
setCarrierInfoAvailability(/* isAvailable= */ true);
@@ -140,12 +127,10 @@
// THEN work succeeded
assertThat(result).isEqualTo(Result.retry());
- // THEN check in request was logged
- verify(mStatsLogger).logGetDeviceCheckInStatus();
}
@Test
- public void checkIn_allInfoAvailable_checkInResponseHasRecoverableError_retryAndNotLogged() {
+ public void checkIn_allInfoAvailable_checkInResponseHasRecoverableError_retry() {
// GIVEN all device info available
setDeviceIdAvailability(/* isAvailable= */ true);
setCarrierInfoAvailability(/* isAvailable= */ true);
@@ -158,12 +143,10 @@
// THEN work succeeded
assertThat(result).isEqualTo(Result.retry());
- // THEN check in request was NOT logged
- verify(mStatsLogger, never()).logGetDeviceCheckInStatus();
}
@Test
- public void checkIn_allInfoAvailable_checkInResponseHasNonRecoverableError_failureAndNotLogged() {
+ public void checkIn_allInfoAvailable_checkInResponseHasNonRecoverableError_failure() {
// GIVEN all device info available
setDeviceIdAvailability(/* isAvailable= */ true);
setCarrierInfoAvailability(/* isAvailable= */ true);
@@ -182,8 +165,6 @@
((TestDeviceLockControllerApplication) ApplicationProvider.getApplicationContext())
.getDeviceLockControllerScheduler();
verify(scheduler).scheduleRetryCheckInWork(eq(RETRY_ON_FAILURE_DELAY));
- // THEN check in request was NOT logged
- verify(mStatsLogger, never()).logGetDeviceCheckInStatus();
}
@Test
diff --git a/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/PauseProvisioningWorkerTest.java b/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/PauseProvisioningWorkerTest.java
index f2d79d7..06edf37 100644
--- a/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/PauseProvisioningWorkerTest.java
+++ b/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/PauseProvisioningWorkerTest.java
@@ -19,8 +19,6 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -36,8 +34,6 @@
import com.android.devicelockcontroller.TestDeviceLockControllerApplication;
import com.android.devicelockcontroller.provision.grpc.DeviceCheckInClient;
import com.android.devicelockcontroller.provision.grpc.PauseDeviceProvisioningGrpcResponse;
-import com.android.devicelockcontroller.stats.StatsLogger;
-import com.android.devicelockcontroller.stats.StatsLoggerProvider;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.testing.TestingExecutors;
@@ -59,7 +55,6 @@
private DeviceCheckInClient mClient;
@Mock
private PauseDeviceProvisioningGrpcResponse mResponse;
- private StatsLogger mStatsLogger;
private PauseProvisioningWorker mWorker;
private TestDeviceLockControllerApplication mTestApp;
@@ -83,18 +78,6 @@
: null;
}
}).build();
- StatsLoggerProvider loggerProvider =
- (StatsLoggerProvider) mTestApp.getApplicationContext();
- mStatsLogger = loggerProvider.getStatsLogger();
- }
-
- @Test
- public void doWork_responseIsSuccessful_resultSuccessAndLogged() {
- when(mResponse.isSuccessful()).thenReturn(true);
-
- assertThat(Futures.getUnchecked(mWorker.startWork())).isEqualTo(Result.success());
- // THEN pause device provisioning was logged
- verify(mStatsLogger).logPauseDeviceProvisioning();
}
@Test
@@ -102,7 +85,5 @@
when(mResponse.isSuccessful()).thenReturn(false);
assertThat(Futures.getUnchecked(mWorker.startWork())).isEqualTo(Result.failure());
- // THEN pause device provisioning was NOT logged
- verify(mStatsLogger, never()).logPauseDeviceProvisioning();
}
}
diff --git a/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/ReportDeviceProvisionStateWorkerTest.java b/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/ReportDeviceProvisionStateWorkerTest.java
index 024063a..23e980b 100644
--- a/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/ReportDeviceProvisionStateWorkerTest.java
+++ b/DeviceLockController/tests/robolectric/src/com/android/devicelockcontroller/provision/worker/ReportDeviceProvisionStateWorkerTest.java
@@ -17,14 +17,12 @@
package com.android.devicelockcontroller.provision.worker;
import static com.android.devicelockcontroller.common.DeviceLockConstants.DeviceProvisionState.PROVISION_STATE_FACTORY_RESET;
-import static com.android.devicelockcontroller.common.DeviceLockConstants.DeviceProvisionState.PROVISION_STATE_SUCCESS;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -44,8 +42,6 @@
import com.android.devicelockcontroller.TestDeviceLockControllerApplication;
import com.android.devicelockcontroller.provision.grpc.DeviceCheckInClient;
import com.android.devicelockcontroller.provision.grpc.ReportDeviceProvisionStateGrpcResponse;
-import com.android.devicelockcontroller.stats.StatsLogger;
-import com.android.devicelockcontroller.stats.StatsLoggerProvider;
import com.android.devicelockcontroller.storage.GlobalParametersClient;
import com.android.devicelockcontroller.storage.UserParameters;
@@ -72,7 +68,6 @@
private DeviceCheckInClient mClient;
@Mock
private ReportDeviceProvisionStateGrpcResponse mResponse;
- private StatsLogger mStatsLogger;
private ReportDeviceProvisionStateWorker mWorker;
private TestDeviceLockControllerApplication mTestApp;
@@ -104,35 +99,26 @@
: null;
}
}).build();
- StatsLoggerProvider loggerProvider =
- (StatsLoggerProvider) mTestApp.getApplicationContext();
- mStatsLogger = loggerProvider.getStatsLogger();
}
@Test
- public void doWork_responseHasRecoverableError_returnRetryAndNotLogged() {
+ public void doWork_responseHasRecoverableError_returnRetry() {
when(mResponse.hasRecoverableError()).thenReturn(true);
assertThat(Futures.getUnchecked(mWorker.startWork())).isEqualTo(Result.retry());
- // THEN report provisioning state or complete was NOT logged
- verify(mStatsLogger, never()).logReportDeviceProvisionState();
- verify(mStatsLogger, never()).logReportDeviceProvisioningComplete();
}
@Test
- public void doWork_responseHasFatalError_returnFailureAndNotLogged() {
+ public void doWork_responseHasFatalError_returnFailure() {
when(mResponse.hasFatalError()).thenReturn(true);
assertThat(Futures.getUnchecked(mWorker.startWork())).isEqualTo(Result.failure());
verify(mTestApp.getDeviceLockControllerScheduler()).scheduleNextProvisionFailedStepAlarm(
/* shouldGoOffImmediately= */ eq(false));
- // THEN report provisioning state or complete was NOT logged
- verify(mStatsLogger, never()).logReportDeviceProvisionState();
- verify(mStatsLogger, never()).logReportDeviceProvisioningComplete();
}
@Test
- public void doWork_responseIsSuccessful_globalParametersShouldBeSet_returnSuccessAndLogReportState()
+ public void doWork_responseIsSuccessful_globalParametersShouldBeSet_returnSuccess()
throws Exception {
when(mResponse.isSuccessful()).thenReturn(true);
when(mResponse.getNextClientProvisionState()).thenReturn(PROVISION_STATE_FACTORY_RESET);
@@ -149,31 +135,5 @@
verify(mTestApp.getDeviceLockControllerScheduler()).scheduleNextProvisionFailedStepAlarm(
/* shouldGoOffImmediately= */ eq(true));
- // THEN report provisioning state was logged
- verify(mStatsLogger).logReportDeviceProvisionState();
- // THEN report provisioning complete was NOT logged
- verify(mStatsLogger, never()).logReportDeviceProvisioningComplete();
- }
-
- @Test
- public void doWork_responseIsSuccessfulAndProvisionComplete_globalParametersShouldBeSet_returnSuccessAndLogReportComplete()
- throws Exception {
- when(mResponse.isSuccessful()).thenReturn(true);
- when(mResponse.getNextClientProvisionState()).thenReturn(PROVISION_STATE_SUCCESS);
- when(mResponse.getDaysLeftUntilReset()).thenReturn(TEST_DAYS_LEFT_UNTIL_RESET);
-
- assertThat(Futures.getUnchecked(mWorker.startWork())).isEqualTo(Result.success());
-
- GlobalParametersClient globalParameters = GlobalParametersClient.getInstance();
- assertThat(globalParameters.getLastReceivedProvisionState().get()).isEqualTo(
- PROVISION_STATE_SUCCESS);
- Executors.newSingleThreadExecutor().submit(
- () -> assertThat(UserParameters.getDaysLeftUntilReset(mTestApp)).isEqualTo(
- TEST_DAYS_LEFT_UNTIL_RESET)).get();
-
- // THEN report provisioning state was NOT logged
- verify(mStatsLogger, never()).logReportDeviceProvisionState();
- // THEN report provisioning complete was logged
- verify(mStatsLogger).logReportDeviceProvisioningComplete();
}
}
