Revert "Fixed FieldClassificationStrategy that gets data from the package info."

This reverts commit cfa0d49be5eba1b878c1eab06a1fb53bdf1a9100.

Bug: 112776204
Test: atest FieldsClassificationTest#testGetAlgorithm

2 files changed, 1 insertions, 21 deletions

diff --git a/core/java/android/service/autofill/AutofillFieldClassificationService.java b/core/java/android/service/autofill/AutofillFieldClassificationService.java
index e5e1c926fbcd..1cd76d2e9ec9 100644
--- a/core/java/android/service/autofill/AutofillFieldClassificationService.java
+++ b/core/java/android/service/autofill/AutofillFieldClassificationService.java
@@ -65,36 +65,16 @@ public abstract class AutofillFieldClassificationService extends Service {
     /**
      * Manifest metadata key for the resource string containing the name of the default field
      * classification algorithm.
-     *
-     * @deprecated Use {@link #RESOURCE_DEFAULT_ALGORITHM} instead.
      */
-    @Deprecated
     public static final String SERVICE_META_DATA_KEY_DEFAULT_ALGORITHM =
             "android.autofill.field_classification.default_algorithm";
-
     /**
      * Manifest metadata key for the resource string array containing the names of all field
      * classification algorithms provided by the service.
-     *
-     * @deprecated Use {@link #RESOURCE_AVAILABLE_ALGORITHMS} instead.
      */
-    @Deprecated
     public static final String SERVICE_META_DATA_KEY_AVAILABLE_ALGORITHMS =
             "android.autofill.field_classification.available_algorithms";
 
-    /**
-     * Name of the resource string containing the name of the default field
-     * classification algorithm.
-     */
-    public static final String RESOURCE_DEFAULT_ALGORITHM =
-            "autofill_field_classification_default_algorithm";
-
-   /**
-    * Name of the resource string array containing the names of all field
-    * classification algorithms provided by the service.
-    */
-    public static final String RESOURCE_AVAILABLE_ALGORITHMS =
-            "autofill_field_classification_available_algorithms";
 
     /** {@hide} **/
     public static final String EXTRA_SCORES = "scores";
diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java
index 2cd4b2bca898..9419e93d0066 100644
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -1413,7 +1413,7 @@ public final class AutofillManager {
         try {
             mService.getAvailableFieldClassificationAlgorithms(receiver);
             final String[] algorithms = receiver
-                    .getObjectResult(SyncResultReceiver.TYPE_STRING_ARRAY);
+                .getObjectResult(SyncResultReceiver.TYPE_STRING_ARRAY);
             return algorithms != null ? Arrays.asList(algorithms) : Collections.emptyList();
         } catch (RemoteException e) {
             e.rethrowFromSystemServer();