Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 528e092b authored by Felipe Leme's avatar Felipe Leme
Browse files

Removed some deprecated APIs that use List instead of Set.

Test: m update-api
Fixes: 124402439

Change-Id: Iba1bd6236ab49d3917db22512c18a929dd7b0773
parent 0be2720c
Loading
Loading
Loading
Loading
+0 −2
Original line number Original line Diff line number Diff line
@@ -6441,7 +6441,6 @@ package android.service.contentcapture {
    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);
    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);
    method public void onDisconnected();
    method public void onDisconnected();
    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);
    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);
    method @Deprecated public final void setContentCaptureWhitelist(@Nullable java.util.List<java.lang.String>, @Nullable java.util.List<android.content.ComponentName>);
    method public final void setContentCaptureWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);
    method public final void setContentCaptureWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);
    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";
    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";
  }
  }
@@ -9434,7 +9433,6 @@ package android.view.accessibility {
package android.view.autofill {
package android.view.autofill {
  public final class AutofillManager {
  public final class AutofillManager {
    method @Deprecated public void setAugmentedAutofillWhitelist(@Nullable java.util.List<java.lang.String>, @Nullable java.util.List<android.content.ComponentName>);
    method public void setAugmentedAutofillWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);
    method public void setAugmentedAutofillWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);
  }
  }
+0 −2
Original line number Original line Diff line number Diff line
@@ -2299,7 +2299,6 @@ package android.service.contentcapture {
    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);
    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);
    method public void onDisconnected();
    method public void onDisconnected();
    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);
    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);
    method @Deprecated public final void setContentCaptureWhitelist(@Nullable java.util.List<java.lang.String>, @Nullable java.util.List<android.content.ComponentName>);
    method public final void setContentCaptureWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);
    method public final void setContentCaptureWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);
    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";
    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";
  }
  }
@@ -2900,7 +2899,6 @@ package android.view.autofill {
  }
  }


  public final class AutofillManager {
  public final class AutofillManager {
    method @Deprecated public void setAugmentedAutofillWhitelist(@Nullable java.util.List<java.lang.String>, @Nullable java.util.List<android.content.ComponentName>);
    method public void setAugmentedAutofillWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);
    method public void setAugmentedAutofillWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);
    field public static final String DEVICE_CONFIG_AUTOFILL_SMART_SUGGESTION_SUPPORTED_MODES = "smart_suggestion_supported_modes";
    field public static final String DEVICE_CONFIG_AUTOFILL_SMART_SUGGESTION_SUPPORTED_MODES = "smart_suggestion_supported_modes";
    field public static final int FLAG_SMART_SUGGESTION_OFF = 0; // 0x0
    field public static final int FLAG_SMART_SUGGESTION_OFF = 0; // 0x0
+0 −14
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ import android.os.Looper;
import android.os.RemoteException;
import android.os.RemoteException;
import android.service.autofill.AutofillService;
import android.service.autofill.AutofillService;
import android.util.ArrayMap;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
import android.util.Log;
import android.util.Slog;
import android.util.Slog;
import android.view.contentcapture.ContentCaptureContext;
import android.view.contentcapture.ContentCaptureContext;
@@ -167,19 +166,6 @@ public abstract class ContentCaptureService extends Service {
        return null;
        return null;
    }
    }


    /**
     * @deprecated use {@link #setContentCaptureWhitelist(Set, Set)} instead
     */
    @Deprecated
    public final void setContentCaptureWhitelist(@Nullable List<String> packages,
            @Nullable List<ComponentName> activities) {
        setContentCaptureWhitelist(toSet(packages), toSet(activities));
    }

    private <T> ArraySet<T> toSet(@Nullable List<T> set) {
        return set == null ? null : new ArraySet<T>(set);
    }

    /**
    /**
     * Explicitly limits content capture to the given packages and activities.
     * Explicitly limits content capture to the given packages and activities.
     *
     *
+0 −16
Original line number Original line Diff line number Diff line
@@ -1826,22 +1826,6 @@ public final class AutofillManager {
        }
        }
    }
    }


    /**
     * @deprecated use {@link #setAugmentedAutofillWhitelist(Set, Set)} instead.
     * @hide
     */
    @SystemApi
    @TestApi
    @Deprecated
    public void setAugmentedAutofillWhitelist(@Nullable List<String> packages,
            @Nullable List<ComponentName> activities) {
        setAugmentedAutofillWhitelist(toSet(packages), toSet(activities));
    }

    private <T> ArraySet<T> toSet(@Nullable List<T> set) {
        return set == null ? null : new ArraySet<T>(set);
    }

    /**
    /**
     * Explicitly limits augmented autofill to the given packages and activities.
     * Explicitly limits augmented autofill to the given packages and activities.
     *
     *