Skip to content

Commit 7049e7f

Browse files
Shivam GargAndroid Build Cherrypicker Worker
authored andcommitted
Recreate setCloudProvider() funtion inorder to pass permission checks
before updating cloud Provider Recreate setCloudProvider() function in PhotoPickerBaseTest class inorder to pass permission checks, added in MediaProvider class while updating the cloud provider. Gave necessary shell permissions to update cloudProvider through shell. Also modified previously present setCloudProvider() function call in all the CTS tests. Bug: b/267327327 Test: - (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9140fd9224210562f009e533b78c9580a35b82d3) Merged-In: I53ee95cc5bea437a607aac5f63c0848e7a22ac12 Change-Id: I53ee95cc5bea437a607aac5f63c0848e7a22ac12
1 parent b27076c commit 7049e7f

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

tests/PhotoPicker/src/android/photopicker/cts/ActionUserSelectImagesForAppTest.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import static android.photopicker.cts.PhotoPickerCloudUtils.isCloudMediaEnabled;
2727
import static android.photopicker.cts.PhotoPickerCloudUtils.selectAndAddPickerMedia;
2828
import static android.photopicker.cts.PickerProviderMediaGenerator.getMediaGenerator;
29-
import static android.photopicker.cts.PickerProviderMediaGenerator.setCloudProvider;
3029
import static android.photopicker.cts.util.PhotoPickerFilesUtils.createImagesAndGetUris;
3130

3231
import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
@@ -61,6 +60,7 @@
6160
import org.junit.Test;
6261
import org.junit.runner.RunWith;
6362

63+
import java.io.IOException;
6464
import java.util.ArrayList;
6565
import java.util.List;
6666

@@ -72,30 +72,35 @@ public class ActionUserSelectImagesForAppTest extends PhotoPickerBaseTest {
7272
private static boolean sCloudMediaPreviouslyEnabled;
7373
@Nullable
7474
private static String sPreviouslyAllowedCloudProviders;
75+
@Nullable
76+
private static String sPreviouslySetCloudProvider;
7577

7678
@BeforeClass
77-
public static void setUpClass() {
79+
public static void setUpClass() throws IOException {
7880
// Store the current Cloud-Media feature configs which we will override during the test,
7981
// and will need to restore after the test finished.
8082
sCloudMediaPreviouslyEnabled = isCloudMediaEnabled();
8183
if (sCloudMediaPreviouslyEnabled) {
8284
sPreviouslyAllowedCloudProviders = getAllowedProvidersDeviceConfig();
8385
}
86+
sPreviouslySetCloudProvider = getCurrentCloudProvider();
8487

8588
// Override the allowed cloud providers config to enable the banners
8689
// (this is a self-instrumenting test, so "target" package name and "own" package name are
8790
// same: android.photopicker.cts).
8891
enableCloudMediaAndSetAllowedCloudProviders(sTargetPackageName);
92+
8993
}
9094

9195
@AfterClass
92-
public static void tearDownClass() {
96+
public static void tearDownClass() throws Exception {
9397
// Restore Cloud-Media feature configs.
9498
if (sCloudMediaPreviouslyEnabled) {
9599
enableCloudMediaAndSetAllowedCloudProviders(sPreviouslyAllowedCloudProviders);
96100
} else {
97101
disableCloudMediaAndClearAllowedCloudProviders();
98102
}
103+
setCloudProvider(sPreviouslySetCloudProvider);
99104
}
100105

101106
@After
@@ -212,7 +217,7 @@ public void testNoCloudContent() throws Exception {
212217
PhotoPickerFilesUtils.deleteMedia(uri, mContext);
213218
}
214219
uriList.clear();
215-
setCloudProvider(mContext, null);
220+
setCloudProvider(null);
216221
}
217222
}
218223

0 commit comments

Comments
 (0)