Merge "Temporarily shortened the autofill service names so the CTS tests pass." into pi-dev
am: 37217d9b8a
Change-Id: I1556b527a1e6abd21c010eb438c458829fbd81e1
diff --git a/tests/autofillservice/AndroidManifest.xml b/tests/autofillservice/AndroidManifest.xml
index 2af9b90..bddf579 100644
--- a/tests/autofillservice/AndroidManifest.xml
+++ b/tests/autofillservice/AndroidManifest.xml
@@ -97,17 +97,19 @@
android:exported="true"
android:process="android.autofillservice.cts.outside"/>
+ <!-- TODO(b/79201521): temporarily using short names so tests don't fail because of ... -->
<service
android:name=".InstrumentedAutoFillService"
- android:label="InstrumentedAutoFillService"
+ android:label="Shorty"
android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
<intent-filter>
<action android:name="android.service.autofill.AutofillService" />
</intent-filter>
</service>
+ <!-- TODO(b/79201521): temporarily using short names so tests don't fail because of ... -->
<service
android:name=".InstrumentedAutoFillServiceCompatMode"
- android:label="InstrumentedAutoFillServiceCompatMode"
+ android:label="ShortyCM"
android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
<intent-filter>
<action android:name="android.service.autofill.AutofillService" />
diff --git a/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java b/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java
index c745457..9f46b40 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java
@@ -43,9 +43,10 @@
import android.service.autofill.FillEventHistory.Event;
import android.service.autofill.FillResponse;
import android.service.autofill.SaveCallback;
-import androidx.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
@@ -84,7 +85,8 @@
public InstrumentedAutoFillService() {
sInstance.set(this);
- sServiceLabel = SERVICE_CLASS;
+ // TODO(b/79201521): temporarily using short names so tests don't fail because of ...
+ sServiceLabel = "Shorty";
}
private static InstrumentedAutoFillService peekInstance() {
diff --git a/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillServiceCompatMode.java b/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillServiceCompatMode.java
index b1c2a45..30a02bf 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillServiceCompatMode.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillServiceCompatMode.java
@@ -31,6 +31,7 @@
public InstrumentedAutoFillServiceCompatMode() {
sInstance.set(this);
- sServiceLabel = SERVICE_CLASS;
+ // TODO(b/79201521): temporarily using short names so tests don't fail because of ...
+ sServiceLabel = "ShortyCM";
}
}