diff options
| -rw-r--r-- | core/java/android/provider/Telephony.java (renamed from telephony/java/android/provider/Telephony.java) | 0 | ||||
| -rw-r--r-- | core/java/android/view/accessibility/TEST_MAPPING | 3 | ||||
| -rw-r--r-- | core/java/android/view/textclassifier/TEST_MAPPING | 3 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java | 9 | ||||
| -rw-r--r-- | services/accessibility/TEST_MAPPING | 6 | ||||
| -rw-r--r-- | telephony/java/android/service/carrier/CarrierIdentifier.aidl (renamed from core/java/android/service/carrier/CarrierIdentifier.aidl) | 0 | ||||
| -rw-r--r-- | telephony/java/android/service/carrier/CarrierIdentifier.java (renamed from core/java/android/service/carrier/CarrierIdentifier.java) | 0 | ||||
| -rw-r--r-- | telephony/java/android/service/carrier/CarrierService.java (renamed from core/java/android/service/carrier/CarrierService.java) | 0 | ||||
| -rw-r--r-- | telephony/java/android/service/carrier/ICarrierService.aidl (renamed from core/java/android/service/carrier/ICarrierService.aidl) | 0 |
9 files changed, 6 insertions, 15 deletions
diff --git a/telephony/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 5063b2c698a3..5063b2c698a3 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java diff --git a/core/java/android/view/accessibility/TEST_MAPPING b/core/java/android/view/accessibility/TEST_MAPPING index 535a31a908a0..d2bd6ea2b702 100644 --- a/core/java/android/view/accessibility/TEST_MAPPING +++ b/core/java/android/view/accessibility/TEST_MAPPING @@ -30,9 +30,6 @@ }, { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate" } ] } diff --git a/core/java/android/view/textclassifier/TEST_MAPPING b/core/java/android/view/textclassifier/TEST_MAPPING index 31e240bf55bb..01a6edecf21e 100644 --- a/core/java/android/view/textclassifier/TEST_MAPPING +++ b/core/java/android/view/textclassifier/TEST_MAPPING @@ -8,9 +8,6 @@ }, { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate" } ] } diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java index c2fa8b2b38da..a9a9550d7909 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java @@ -529,8 +529,10 @@ public class TextClassifierTest { } @Test - public void testSuggetsConversationActions_deduplicate() { - if (isTextClassifierDisabled()) return; + public void testSuggestConversationActions_deduplicate() { + Context context = new FakeContextBuilder() + .setIntentComponent(Intent.ACTION_SENDTO, FakeContextBuilder.DEFAULT_COMPONENT) + .build(); ConversationActions.Message message = new ConversationActions.Message.Builder( ConversationActions.Message.PERSON_USER_OTHERS) @@ -541,7 +543,8 @@ public class TextClassifierTest { .setMaxSuggestions(3) .build(); - ConversationActions conversationActions = mClassifier.suggestConversationActions(request); + TextClassifier classifier = new TextClassifierImpl(context, TC_CONSTANTS); + ConversationActions conversationActions = classifier.suggestConversationActions(request); Truth.assertThat(conversationActions.getConversationActions()).isEmpty(); } diff --git a/services/accessibility/TEST_MAPPING b/services/accessibility/TEST_MAPPING index 45c52452afb4..d90c3bd9b4c2 100644 --- a/services/accessibility/TEST_MAPPING +++ b/services/accessibility/TEST_MAPPING @@ -52,9 +52,6 @@ }, { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate" } ] }, @@ -66,9 +63,6 @@ }, { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate" } ] } diff --git a/core/java/android/service/carrier/CarrierIdentifier.aidl b/telephony/java/android/service/carrier/CarrierIdentifier.aidl index 48b13983050d..48b13983050d 100644 --- a/core/java/android/service/carrier/CarrierIdentifier.aidl +++ b/telephony/java/android/service/carrier/CarrierIdentifier.aidl diff --git a/core/java/android/service/carrier/CarrierIdentifier.java b/telephony/java/android/service/carrier/CarrierIdentifier.java index af5bf7475f95..af5bf7475f95 100644 --- a/core/java/android/service/carrier/CarrierIdentifier.java +++ b/telephony/java/android/service/carrier/CarrierIdentifier.java diff --git a/core/java/android/service/carrier/CarrierService.java b/telephony/java/android/service/carrier/CarrierService.java index eefc1b70bac9..eefc1b70bac9 100644 --- a/core/java/android/service/carrier/CarrierService.java +++ b/telephony/java/android/service/carrier/CarrierService.java diff --git a/core/java/android/service/carrier/ICarrierService.aidl b/telephony/java/android/service/carrier/ICarrierService.aidl index ac6f9614d8f5..ac6f9614d8f5 100644 --- a/core/java/android/service/carrier/ICarrierService.aidl +++ b/telephony/java/android/service/carrier/ICarrierService.aidl |