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

Commit 6b30447a authored by Anna Malova's avatar Anna Malova Committed by Android (Google) Code Review
Browse files

Merge "Rename PacProcessor#releasePacProcessor to PacProcessor#release."

parents e30572f4 913e00c8

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -13243,7 +13243,7 @@ package android.webkit { 
    method @Nullable public String findProxyForUrl(@NonNull String);

    method @Nullable public String findProxyForUrl(@NonNull String);

    method @NonNull public static android.webkit.PacProcessor getInstance();

    method @NonNull public static android.webkit.PacProcessor getInstance();

    method @Nullable public default android.net.Network getNetwork();

    method @Nullable public default android.net.Network getNetwork();

    method public default void releasePacProcessor();

    method public default void release();

    method public default void setNetwork(@Nullable android.net.Network);

    method public default void setNetwork(@Nullable android.net.Network);

    method public boolean setProxyScript(@NonNull String);

    method public boolean setProxyScript(@NonNull String);

  }

  }

core/java/android/webkit/PacProcessor.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ public interface PacProcessor { 
     *

     *

     * <p> There can only be one default {@link PacProcessor} instance.

     * <p> There can only be one default {@link PacProcessor} instance.

     * This method will create a new instance if one did not already exist, or

     * This method will create a new instance if one did not already exist, or

     * if the previous instance was released with {@link #releasePacProcessor}.

     * if the previous instance was released with {@link #release}.

     *

     *

     * @return the default PacProcessor instance.

     * @return the default PacProcessor instance.

     */

     */
@@ -47,7 +47,7 @@ public interface PacProcessor { 
     * Create a new PacProcessor instance.

     * Create a new PacProcessor instance.

     *

     *

     * <p> The created instance needs to be released manually once it is no longer needed

     * <p> The created instance needs to be released manually once it is no longer needed

     * by calling {@link #releasePacProcessor} to prevent memory leaks.

     * by calling {@link #release} to prevent memory leaks.

     *

     *

     * <p> The created instance is not tied to any particular {@link Network}.

     * <p> The created instance is not tied to any particular {@link Network}.

     * To associate {@link PacProcessor} with a {@link Network} use {@link #setNetwork} method.

     * To associate {@link PacProcessor} with a {@link Network} use {@link #setNetwork} method.
@@ -82,7 +82,7 @@ public interface PacProcessor { 
     * {@link #getInstance} and {@link #getInstanceForNetwork}

     * {@link #getInstance} and {@link #getInstanceForNetwork}

     * for the same network will create a new instance.

     * for the same network will create a new instance.

     */

     */

    default void releasePacProcessor() {

    default void release() {

        throw new UnsupportedOperationException("Not implemented");

        throw new UnsupportedOperationException("Not implemented");

    }

    }

non-updatable-api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -12077,7 +12077,7 @@ package android.webkit { 
    method @Nullable public String findProxyForUrl(@NonNull String);

    method @Nullable public String findProxyForUrl(@NonNull String);

    method @NonNull public static android.webkit.PacProcessor getInstance();

    method @NonNull public static android.webkit.PacProcessor getInstance();

    method @Nullable public default android.net.Network getNetwork();

    method @Nullable public default android.net.Network getNetwork();

    method public default void releasePacProcessor();

    method public default void release();

    method public default void setNetwork(@Nullable android.net.Network);

    method public default void setNetwork(@Nullable android.net.Network);

    method public boolean setProxyScript(@NonNull String);

    method public boolean setProxyScript(@NonNull String);

  }

  }