Merge "Fix ActionUserSelectImagesForAppTest setup for devices that receive mainline updates." into android14-tests-dev

Treehugger Robot · Gerrit Code Review · commit f4baa0a25405 · 2023-11-27T19:43:34.000Z
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/ActionUserSelectImagesForAppTest.java b/tests/PhotoPicker/src/android/photopicker/cts/ActionUserSelectImagesForAppTest.java
@@ -84,7 +84,6 @@ public static void setUpClass() throws IOException {
         if (sCloudMediaPreviouslyEnabled) {
             sPreviouslyAllowedCloudProviders = getAllowedProvidersDeviceConfig();
         }
-        sPreviouslySetCloudProvider = getCurrentCloudProvider();
 
         try {
             sPreviouslySetCloudProvider = getCurrentCloudProvider();

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ public static void setUpClass() throws IOException {`
`84`	`84`	`if (sCloudMediaPreviouslyEnabled) {`
`85`	`85`	`sPreviouslyAllowedCloudProviders = getAllowedProvidersDeviceConfig();`
`86`	`86`	`}`
`87`		`- sPreviouslySetCloudProvider = getCurrentCloudProvider();`
`88`	`87`
`89`	`88`	`try {`
`90`	`89`	`sPreviouslySetCloudProvider = getCurrentCloudProvider();`