Revert "- Allow disabling framework Backup scheduling"

This reverts commit 748c64d9dd728cdbaf8004c8be1b4f372c4cd624.

Reason for revert: DroidMonitor: Potential culprit for b/265432205 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Bug: b/265432205
Change-Id: I11e21ad5048635716adb5724b7d78d5513fc60e9

2 files changed, 14 insertions, 66 deletions

diff --git a/services/robotests/backup/src/com/android/server/backup/FullBackupJobTest.java b/services/robotests/backup/src/com/android/server/backup/FullBackupJobTest.java
index c8797e25b740..dbc0da707477 100644
--- a/services/robotests/backup/src/com/android/server/backup/FullBackupJobTest.java
+++ b/services/robotests/backup/src/com/android/server/backup/FullBackupJobTest.java
@@ -18,8 +18,6 @@ package com.android.server.backup;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.when;
-
 import android.annotation.UserIdInt;
 import android.app.job.JobScheduler;
 import android.content.Context;
@@ -33,8 +31,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
@@ -49,20 +45,14 @@ public class FullBackupJobTest {
     private BackupManagerConstants mConstants;
     private ShadowJobScheduler mShadowJobScheduler;
 
-    @Mock
-    private UserBackupManagerService mUserBackupManagerService;
-
     @UserIdInt private int mUserOneId;
     @UserIdInt private int mUserTwoId;
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mConstants = new BackupManagerConstants(Handler.getMain(), mContext.getContentResolver());
         mConstants.start();
-        when(mUserBackupManagerService.getConstants()).thenReturn(mConstants);
-        when(mUserBackupManagerService.isFrameworkSchedulingEnabled()).thenReturn(true);
 
         mShadowJobScheduler = Shadows.shadowOf(mContext.getSystemService(JobScheduler.class));
 
@@ -79,8 +69,8 @@ public class FullBackupJobTest {
 
     @Test
     public void testSchedule_afterScheduling_jobExists() {
-        FullBackupJob.schedule(mUserOneId, mContext, 0, mUserBackupManagerService);
-        FullBackupJob.schedule(mUserTwoId, mContext, 0, mUserBackupManagerService);
+        FullBackupJob.schedule(mUserOneId, mContext, 0, mConstants);
+        FullBackupJob.schedule(mUserTwoId, mContext, 0, mConstants);
 
         assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserOneId))).isNotNull();
         assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserTwoId))).isNotNull();
@@ -88,34 +78,18 @@ public class FullBackupJobTest {
 
     @Test
     public void testCancel_afterCancelling_jobDoesntExist() {
-        FullBackupJob.schedule(mUserOneId, mContext, 0, mUserBackupManagerService);
-        FullBackupJob.schedule(mUserTwoId, mContext, 0, mUserBackupManagerService);
+        FullBackupJob.schedule(mUserOneId, mContext, 0, mConstants);
+        FullBackupJob.schedule(mUserTwoId, mContext, 0, mConstants);
         FullBackupJob.cancel(mUserOneId, mContext);
         FullBackupJob.cancel(mUserTwoId, mContext);
 
         assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserOneId))).isNull();
         assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserTwoId))).isNull();
     }
-
-    @Test
-    public void testSchedule_isNoopIfDisabled() {
-        when(mUserBackupManagerService.isFrameworkSchedulingEnabled()).thenReturn(false);
-        FullBackupJob.schedule(mUserOneId, mContext, 0, mUserBackupManagerService);
-
-        assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserOneId))).isNull();
-    }
-
-    @Test
-    public void testSchedule_schedulesJobIfEnabled() {
-        when(mUserBackupManagerService.isFrameworkSchedulingEnabled()).thenReturn(true);
-        FullBackupJob.schedule(mUserOneId, mContext, 0, mUserBackupManagerService);
-
-        assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserOneId))).isNotNull();
-    }
 //
     @Test
     public void testSchedule_onlySchedulesForRequestedUser() {
-        FullBackupJob.schedule(mUserOneId, mContext, 0, mUserBackupManagerService);
+        FullBackupJob.schedule(mUserOneId, mContext, 0, mConstants);
 
         assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserOneId))).isNotNull();
         assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserTwoId))).isNull();
@@ -123,8 +97,8 @@ public class FullBackupJobTest {
 //
     @Test
     public void testCancel_onlyCancelsForRequestedUser() {
-        FullBackupJob.schedule(mUserOneId, mContext, 0, mUserBackupManagerService);
-        FullBackupJob.schedule(mUserTwoId, mContext, 0, mUserBackupManagerService);
+        FullBackupJob.schedule(mUserOneId, mContext, 0, mConstants);
+        FullBackupJob.schedule(mUserTwoId, mContext, 0, mConstants);
         FullBackupJob.cancel(mUserOneId, mContext);
 
         assertThat(mShadowJobScheduler.getPendingJob(getJobIdForUserId(mUserOneId))).isNull();
diff --git a/services/robotests/backup/src/com/android/server/backup/KeyValueBackupJobTest.java b/services/robotests/backup/src/com/android/server/backup/KeyValueBackupJobTest.java
index 712ac55d2ff5..1c5fac28de3c 100644
--- a/services/robotests/backup/src/com/android/server/backup/KeyValueBackupJobTest.java
+++ b/services/robotests/backup/src/com/android/server/backup/KeyValueBackupJobTest.java
@@ -18,8 +18,6 @@ package com.android.server.backup;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.when;
-
 import android.annotation.UserIdInt;
 import android.content.Context;
 import android.os.Handler;
@@ -32,8 +30,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
@@ -45,20 +41,14 @@ public class KeyValueBackupJobTest {
     private Context mContext;
     private BackupManagerConstants mConstants;
 
-    @Mock
-    private UserBackupManagerService mUserBackupManagerService;
-
     @UserIdInt private int mUserOneId;
     @UserIdInt private int mUserTwoId;
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mConstants = new BackupManagerConstants(Handler.getMain(), mContext.getContentResolver());
         mConstants.start();
-        when(mUserBackupManagerService.getConstants()).thenReturn(mConstants);
-        when(mUserBackupManagerService.isFrameworkSchedulingEnabled()).thenReturn(true);
 
         mUserOneId = UserHandle.USER_SYSTEM;
         mUserTwoId = mUserOneId + 1;
@@ -72,22 +62,6 @@ public class KeyValueBackupJobTest {
     }
 
     @Test
-    public void testSchedule_isNoopIfDisabled() {
-        when(mUserBackupManagerService.isFrameworkSchedulingEnabled()).thenReturn(false);
-        KeyValueBackupJob.schedule(mUserOneId, mContext, mUserBackupManagerService);
-
-        assertThat(KeyValueBackupJob.isScheduled(mUserOneId)).isFalse();
-    }
-
-    @Test
-    public void testSchedule_schedulesJobIfEnabled() {
-        when(mUserBackupManagerService.isFrameworkSchedulingEnabled()).thenReturn(true);
-        KeyValueBackupJob.schedule(mUserOneId, mContext, mUserBackupManagerService);
-
-        assertThat(KeyValueBackupJob.isScheduled(mUserOneId)).isTrue();
-    }
-
-    @Test
     public void testIsScheduled_beforeScheduling_returnsFalse() {
         assertThat(KeyValueBackupJob.isScheduled(mUserOneId)).isFalse();
         assertThat(KeyValueBackupJob.isScheduled(mUserTwoId)).isFalse();
@@ -95,8 +69,8 @@ public class KeyValueBackupJobTest {
 
     @Test
     public void testIsScheduled_afterScheduling_returnsTrue() {
-        KeyValueBackupJob.schedule(mUserOneId, mContext, mUserBackupManagerService);
-        KeyValueBackupJob.schedule(mUserTwoId, mContext, mUserBackupManagerService);
+        KeyValueBackupJob.schedule(mUserOneId, mContext, mConstants);
+        KeyValueBackupJob.schedule(mUserTwoId, mContext, mConstants);
 
         assertThat(KeyValueBackupJob.isScheduled(mUserOneId)).isTrue();
         assertThat(KeyValueBackupJob.isScheduled(mUserTwoId)).isTrue();
@@ -104,8 +78,8 @@ public class KeyValueBackupJobTest {
 
     @Test
     public void testIsScheduled_afterCancelling_returnsFalse() {
-        KeyValueBackupJob.schedule(mUserOneId, mContext, mUserBackupManagerService);
-        KeyValueBackupJob.schedule(mUserTwoId, mContext, mUserBackupManagerService);
+        KeyValueBackupJob.schedule(mUserOneId, mContext, mConstants);
+        KeyValueBackupJob.schedule(mUserTwoId, mContext, mConstants);
         KeyValueBackupJob.cancel(mUserOneId, mContext);
         KeyValueBackupJob.cancel(mUserTwoId, mContext);
 
@@ -115,7 +89,7 @@ public class KeyValueBackupJobTest {
 
     @Test
     public void testIsScheduled_afterScheduling_returnsTrueOnlyForScheduledUser() {
-        KeyValueBackupJob.schedule(mUserOneId, mContext, mUserBackupManagerService);
+        KeyValueBackupJob.schedule(mUserOneId, mContext, mConstants);
 
         assertThat(KeyValueBackupJob.isScheduled(mUserOneId)).isTrue();
         assertThat(KeyValueBackupJob.isScheduled(mUserTwoId)).isFalse();
@@ -123,8 +97,8 @@ public class KeyValueBackupJobTest {
 
     @Test
     public void testIsScheduled_afterCancelling_returnsFalseOnlyForCancelledUser() {
-        KeyValueBackupJob.schedule(mUserOneId, mContext, mUserBackupManagerService);
-        KeyValueBackupJob.schedule(mUserTwoId, mContext, mUserBackupManagerService);
+        KeyValueBackupJob.schedule(mUserOneId, mContext, mConstants);
+        KeyValueBackupJob.schedule(mUserTwoId, mContext, mConstants);
         KeyValueBackupJob.cancel(mUserOneId, mContext);
 
         assertThat(KeyValueBackupJob.isScheduled(mUserOneId)).isFalse();