diff options
Diffstat (limited to 'tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java')
-rw-r--r-- | tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java b/tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java index 27cd7fde595..f2e3c684d60 100644 --- a/tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java +++ b/tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java @@ -18,11 +18,9 @@ package android.photopicker.cts; import static android.photopicker.cts.PhotoPickerCloudUtils.addImage; import static android.photopicker.cts.PhotoPickerCloudUtils.containsExcept; -import static android.photopicker.cts.PhotoPickerCloudUtils.disableCloudMediaAndClearAllowedCloudProviders; +import static android.photopicker.cts.PhotoPickerCloudUtils.disableDeviceConfigSync; import static android.photopicker.cts.PhotoPickerCloudUtils.enableCloudMediaAndSetAllowedCloudProviders; import static android.photopicker.cts.PhotoPickerCloudUtils.extractMediaIds; -import static android.photopicker.cts.PhotoPickerCloudUtils.getAllowedProvidersDeviceConfig; -import static android.photopicker.cts.PhotoPickerCloudUtils.isCloudMediaEnabled; import static android.photopicker.cts.PickerProviderMediaGenerator.MediaGenerator; import static android.photopicker.cts.PickerProviderMediaGenerator.syncCloudProvider; import static android.photopicker.cts.util.PhotoPickerFilesUtils.createImagesAndGetUris; @@ -46,7 +44,6 @@ import android.photopicker.cts.cloudproviders.CloudProviderNoPermission; import android.photopicker.cts.cloudproviders.CloudProviderPrimary; import android.photopicker.cts.cloudproviders.CloudProviderSecondary; import android.provider.MediaStore; -import android.util.Log; import android.util.Pair; import androidx.annotation.Nullable; @@ -85,25 +82,14 @@ public class CloudPhotoPickerTest extends PhotoPickerBaseTest { private static final String CLOUD_ID1 = "CLOUD_ID1"; private static final String CLOUD_ID2 = "CLOUD_ID2"; - private static boolean sCloudMediaPreviouslyEnabled; - private static String sPreviouslyAllowedCloudProviders; @Nullable - private static String sPreviouslySetCloudProvider; + private static DeviceStatePreserver sDeviceStatePreserver; @BeforeClass public static void setUpBeforeClass() throws IOException { - // Store the current CMP configs, so that we can reset them at the end of the test. - sCloudMediaPreviouslyEnabled = isCloudMediaEnabled(); - if (sCloudMediaPreviouslyEnabled) { - sPreviouslyAllowedCloudProviders = getAllowedProvidersDeviceConfig(); - } - - try { - sPreviouslySetCloudProvider = getCurrentCloudProvider(); - } catch (RuntimeException e) { - Log.e(TAG, "Could not get previously set cloud provider", e); - sPreviouslySetCloudProvider = INVALID_CLOUD_PROVIDER; - } + sDeviceStatePreserver = new DeviceStatePreserver(sDevice); + sDeviceStatePreserver.saveCurrentCloudProviderState(); + disableDeviceConfigSync(); // This is a self-instrumentation test, so both "target" package name and "own" package name // should be the same (android.photopicker.cts). @@ -112,13 +98,7 @@ public class CloudPhotoPickerTest extends PhotoPickerBaseTest { @AfterClass public static void tearDownClass() throws Exception { - // Reset CloudMedia configs. - if (sCloudMediaPreviouslyEnabled) { - enableCloudMediaAndSetAllowedCloudProviders(sPreviouslyAllowedCloudProviders); - } else { - disableCloudMediaAndClearAllowedCloudProviders(); - } - setCloudProvider(sPreviouslySetCloudProvider); + sDeviceStatePreserver.restoreCloudProviderState(); } @Before public void setUp() throws Exception { |