Remove dependence on sync mode from textclassifier tests am: 78e4846376 am: 20a3b57202 am: aa7ff0719d am: ee1a5c5fd4

Original change: https://android-review.googlesource.com/c/platform/external/libtextclassifier/+/2645787

Change-Id: I0a90f70d725c2626fb5453fccd84d0cb90d4fe45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/java/tests/instrumentation/Android.bp b/java/tests/instrumentation/Android.bp
index 775f9f9..02757b8 100644
--- a/java/tests/instrumentation/Android.bp
+++ b/java/tests/instrumentation/Android.bp
@@ -36,6 +36,7 @@ java_library {
         "TextClassifierServiceLib",
         "androidx.test.espresso.core",
         "mockito-target-minus-junit4",
+        "compatibility-device-util-axt",
     ],
 }
 
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/testing/ExtServicesTextClassifierRule.java b/java/tests/instrumentation/src/com/android/textclassifier/testing/ExtServicesTextClassifierRule.java
index 5f8247d..1b6405a 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/testing/ExtServicesTextClassifierRule.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/testing/ExtServicesTextClassifierRule.java
@@ -25,6 +25,7 @@ import android.view.textclassifier.TextClassificationManager;
 import android.view.textclassifier.TextClassifier;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.platform.app.InstrumentationRegistry;
+import com.android.compatibility.common.util.DeviceConfigStateHelper;
 import com.google.common.io.ByteStreams;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -57,7 +58,8 @@ public final class ExtServicesTextClassifierRule extends ExternalResource {
   @Override
   protected void after() {
     try {
-      DeviceConfig.setProperties(originalProperties);
+      DeviceConfigStateHelper.callWithSyncEnabledWithShellPermissions(() ->
+          DeviceConfig.setProperties(originalProperties));
     } catch (Throwable t) {
       Log.e(TAG, "Failed to reset DeviceConfig", t);
     } finally {
@@ -79,7 +81,8 @@ public final class ExtServicesTextClassifierRule extends ExternalResource {
    * hidden API.
    */
   public void overrideDeviceConfig() throws Exception {
-    DeviceConfig.setProperties(newPropertiesBuilder.build());
+    DeviceConfigStateHelper.callWithSyncEnabledWithShellPermissions(() ->
+        DeviceConfig.setProperties(newPropertiesBuilder.build()));
   }
 
   /** Force stop ExtServices. Force-stop-and-start can be helpful to reload some states. */