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

Commit a936b91a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removed some deprecated APIs that use List instead of Set."

parents 5f0b120f 528e092b

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -6446,7 +6446,6 @@ package android.service.contentcapture { 
    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);

    method public void onDisconnected();

    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>);

    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";

  }
@@ -9500,7 +9499,6 @@ package android.view.accessibility { 
package android.view.autofill {















  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>);















  }







































api/test-current.txt



+0
−2






























Original line number
Diff line number
Diff line








@@ -2307,7 +2307,6 @@ package android.service.contentcapture {













    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);















    method public void onDisconnected();















    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>);















    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";















  }










@@ -2935,7 +2934,6 @@ package android.view.autofill {













  }































  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>);















    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

































core/java/android/service/contentcapture/ContentCaptureService.java



+0
−14






























Original line number
Diff line number
Diff line








@@ -37,7 +37,6 @@ import android.os.Looper;













import android.os.RemoteException;















import android.service.autofill.AutofillService;















import android.util.ArrayMap;













import android.util.ArraySet;















import android.util.Log;















import android.util.Slog;















import android.view.contentcapture.ContentCaptureContext;










@@ -167,19 +166,6 @@ public abstract class ContentCaptureService extends Service {













        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.















     *

































core/java/android/view/autofill/AutofillManager.java



+0
−16






























Original line number
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.















     *