diff options
| author | Al Sutton <alsutton@google.com> | 2020-02-21 10:42:55 +0000 |
|---|---|---|
| committer | Al Sutton <alsutton@google.com> | 2020-02-21 10:49:57 +0000 |
| commit | feebe8143e83dd26de6123fa07393c1d89d43f53 (patch) | |
| tree | 29b1cff36934d5e1147448b77ece387a107811b4 /services/robotests | |
| parent | f748ca137e606dce4c035e54d9a9dbd4501b67bd (diff) | |
Revert "Add feature flag for "no data" backup calls"
This reverts commit 27c64a3bed785f1bd4bda4896b4df0807d0804d2.
Reason for revert: The GMSCore code to handle the flag will be part of DP2 and so we can remove the flag ahead of the cut.
GMSCore CL Status; https://cl-status.corp.google.com/#/summary/gmscore_prod/291378558
GMSCore Calendar; http://go/gms-schedule
Bug: 147481066
Test: m -j RunBackupFrameworksServicesRoboTests
Change-Id: I4159e064e739c6f366063c7fadd7cca40a7f07d9
Diffstat (limited to 'services/robotests')
| -rw-r--r-- | services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java index 62ff3a1c2126..ec56e1ebc8e0 100644 --- a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java +++ b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java @@ -96,7 +96,6 @@ import android.os.Message; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; -import android.util.FeatureFlagUtils; import android.util.Pair; import com.android.internal.backup.IBackupTransport; @@ -259,9 +258,6 @@ public class KeyValueBackupTaskTest { public void tearDown() throws Exception { ShadowBackupDataInput.reset(); ShadowApplicationPackageManager.reset(); - // False by default. - FeatureFlagUtils.setEnabled( - mContext, FeatureFlagUtils.BACKUP_NO_KV_DATA_CHANGE_CALLS, false); } @Test @@ -2348,9 +2344,6 @@ public class KeyValueBackupTaskTest { @Test public void testRunTask_whenNoDataToBackupOnFirstBackup_doesNotTellTransportOfBackup() throws Exception { - FeatureFlagUtils.setEnabled( - mContext, FeatureFlagUtils.BACKUP_NO_KV_DATA_CHANGE_CALLS, true); - TransportMock transportMock = setUpInitializedTransport(mTransport); mBackupManagerService.setCurrentToken(0L); when(transportMock.transport.getCurrentRestoreSet()).thenReturn(1234L); @@ -2368,9 +2361,6 @@ public class KeyValueBackupTaskTest { @Test public void testRunTask_whenBackupHasCompletedAndThenNoDataChanges_transportGetsNotified() throws Exception { - FeatureFlagUtils.setEnabled( - mContext, FeatureFlagUtils.BACKUP_NO_KV_DATA_CHANGE_CALLS, true); - TransportMock transportMock = setUpInitializedTransport(mTransport); when(transportMock.transport.getCurrentRestoreSet()).thenReturn(1234L); when(transportMock.transport.isAppEligibleForBackup( |