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

Commit 90c292b1 authored by Chalard Jean's avatar Chalard Jean Committed by Gerrit Code Review
Browse files

Merge changes from topics "api-fix-networkagent", "satisfiedby" 

* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
parents 4fa9742c 3d223986

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29236,11 +29236,11 @@ package android.net { 
  }















  public class NetworkRequest implements android.os.Parcelable {













    method public boolean canBeSatisfiedBy(@Nullable android.net.NetworkCapabilities);















    method public int describeContents();















    method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();















    method public boolean hasCapability(int);















    method public boolean hasTransport(int);













    method public boolean satisfiedBy(@Nullable android.net.NetworkCapabilities);















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkRequest> CREATOR;















  }

























api/system-current.txt



+3
−16




























Original line number
Diff line number
Diff line








@@ -4519,7 +4519,6 @@ package android.net {













  public final class MatchAllNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {















    ctor public MatchAllNetworkSpecifier();















    method public int describeContents();













    method public boolean satisfiedBy(android.net.NetworkSpecifier);















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.net.MatchAllNetworkSpecifier> CREATOR;















  }









@@ -4540,13 +4539,14 @@ package android.net {













  public abstract class NetworkAgent {















    ctor public NetworkAgent(@NonNull android.content.Context, @NonNull android.os.Looper, @NonNull String, @NonNull android.net.NetworkCapabilities, @NonNull android.net.LinkProperties, int, @NonNull android.net.NetworkAgentConfig, @Nullable android.net.NetworkProvider);















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













    method public void markConnected();















    method public void onAddKeepalivePacketFilter(int, @NonNull android.net.KeepalivePacketData);















    method public void onAutomaticReconnectDisabled();















    method public void onNetworkUnwanted();















    method public void onRemoveKeepalivePacketFilter(int);















    method public void onSaveAcceptUnvalidated(boolean);















    method public void onSignalStrengthThresholdsUpdated(@NonNull int[]);













    method public void onStartSocketKeepalive(int, @IntRange(from=10, to=3600) int, @NonNull android.net.KeepalivePacketData);













    method public void onStartSocketKeepalive(int, @NonNull java.time.Duration, @NonNull android.net.KeepalivePacketData);















    method public void onStopSocketKeepalive(int);















    method public void onValidationStatus(int, @Nullable android.net.Uri);















    method @NonNull public android.net.Network register();









@@ -4554,7 +4554,6 @@ package android.net {













    method public final void sendNetworkCapabilities(@NonNull android.net.NetworkCapabilities);















    method public final void sendNetworkScore(@IntRange(from=0, to=99) int);















    method public final void sendSocketKeepaliveEvent(int, int);













    method public void setConnected();















    method public void unregister();















    field public static final int VALIDATION_STATUS_NOT_VALID = 2; // 0x2















    field public static final int VALIDATION_STATUS_VALID = 1; // 0x1










@@ -4672,8 +4671,8 @@ package android.net {













  }





























  public abstract class NetworkSpecifier {













    method public boolean canBeSatisfiedBy(@Nullable android.net.NetworkSpecifier);















    method @Nullable public android.net.NetworkSpecifier redact();













    method public abstract boolean satisfiedBy(@Nullable android.net.NetworkSpecifier);















  }





























  public class NetworkStack {










@@ -4776,10 +4775,6 @@ package android.net {













    method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress);















  }



























  public final class TelephonyNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {













    method public boolean satisfiedBy(android.net.NetworkSpecifier);













  }



























  public final class TetheredClient implements android.os.Parcelable {















    ctor public TetheredClient(@NonNull android.net.MacAddress, @NonNull java.util.Collection<android.net.TetheredClient.AddressInfo>, int);















    method public int describeContents();










@@ -5470,10 +5465,6 @@ package android.net.wifi {













    field public int numUsage;















  }



























  public final class WifiNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {













    method public boolean satisfiedBy(android.net.NetworkSpecifier);













  }



























  public class WifiScanner {















    method @Deprecated public void configureWifiChange(int, int, int, int, int, android.net.wifi.WifiScanner.BssidInfo[]);















    method @Deprecated public void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings);










@@ -5638,10 +5629,6 @@ package android.net.wifi.aware {













    method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPmk(@NonNull android.net.wifi.aware.PeerHandle, @NonNull byte[]);















  }



























  public final class WifiAwareNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {













    method public boolean satisfiedBy(android.net.NetworkSpecifier);













  }



























  public static final class WifiAwareNetworkSpecifier.Builder {















    method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPmk(@NonNull byte[]);















  }

































core/java/android/net/NetworkAgent.java



+20
−11




























Original line number
Diff line number
Diff line








@@ -36,6 +36,7 @@ import com.android.internal.util.Protocol;





























import java.lang.annotation.Retention;















import java.lang.annotation.RetentionPolicy;













import java.time.Duration;















import java.util.ArrayList;















import java.util.Objects;















import java.util.concurrent.atomic.AtomicBoolean;









@@ -47,7 +48,7 @@ import java.util.concurrent.atomic.AtomicBoolean;













 * An agent manages the life cycle of a network. A network starts its















 * life cycle when {@link register} is called on NetworkAgent. The network















 * is then connecting. When full L3 connectivity has been established,













 * the agent shoud call {@link setConnected} to inform the system that













 * the agent shoud call {@link markConnected} to inform the system that















 * this network is ready to use. When the network disconnects its life















 * ends and the agent should call {@link unregister}, at which point the















 * system will clean up and free resources.










@@ -503,7 +504,8 @@ public abstract class NetworkAgent {













                    break;















                }















                case CMD_START_SOCKET_KEEPALIVE: {













                    onStartSocketKeepalive(msg.arg1 /* slot */, msg.arg2 /* interval */,













                    onStartSocketKeepalive(msg.arg1 /* slot */,













                            Duration.ofSeconds(msg.arg2) /* interval */,















                            (KeepalivePacketData) msg.obj /* packet */);















                    break;















                }










@@ -617,10 +619,10 @@ public abstract class NetworkAgent {













     * Inform ConnectivityService that this agent has now connected.















     * Call {@link #unregister} to disconnect.















     */













    public void setConnected() {













    public void markConnected() {















        if (mIsLegacy) {















            throw new UnsupportedOperationException(













                    "Legacy agents can't call setConnected.");













                    "Legacy agents can't call markConnected.");















        }















        mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);















        queueOrSendMessage(EVENT_NETWORK_INFO_CHANGED, mNetworkInfo);










@@ -798,8 +800,8 @@ public abstract class NetworkAgent {













     * {@code VALIDATION_STATUS_VALID} if Internet connectivity was validated,















     * {@code VALIDATION_STATUS_NOT_VALID} if Internet connectivity was not validated.















     *













     * This may be called multiple times as network status changes, or if there are multiple













     * subsequent attempts to validate connectivity that fail.













     * This is guaranteed to be called again when the network status changes, but the system













     * may also call this multiple times even if the status does not change.















     *















     * @param status one of {@code VALIDATION_STATUS_VALID} or {@code VALIDATION_STATUS_NOT_VALID}.















     * @param redirectUri If Internet connectivity is being redirected (e.g., on a captive portal),










@@ -832,18 +834,25 @@ public abstract class NetworkAgent {













     * Requests that the network hardware send the specified packet at the specified interval.















     *















     * @param slot the hardware slot on which to start the keepalive.













     * @param intervalSeconds the interval between packets













     * @param interval the interval between packets, between 10 and 3600. Note that this API













     *                 does not support sub-second precision and will round off the request.















     * @param packet the packet to send.















     */















    // seconds is from SocketKeepalive.MIN_INTERVAL_SEC to MAX_INTERVAL_SEC, but these should















    // not be exposed as constants because they may change in the future (API guideline 4.8)















    // and should have getters if exposed at all. Getters can't be used in the annotation,















    // so the values unfortunately need to be copied.













    public void onStartSocketKeepalive(int slot,













            @IntRange(from = 10, to = 3600) int intervalSeconds,













    public void onStartSocketKeepalive(int slot, @NonNull Duration interval,















            @NonNull KeepalivePacketData packet) {













        Message msg = mHandler.obtainMessage(CMD_START_SOCKET_KEEPALIVE, slot, intervalSeconds,













                packet);













        final long intervalSeconds = interval.getSeconds();













        if (intervalSeconds < SocketKeepalive.MIN_INTERVAL_SEC













                || intervalSeconds > SocketKeepalive.MAX_INTERVAL_SEC) {













            throw new IllegalArgumentException("Interval needs to be comprised between "













                    + SocketKeepalive.MIN_INTERVAL_SEC + " and " + SocketKeepalive.MAX_INTERVAL_SEC













                    + " but was " + intervalSeconds);













        }













        final Message msg = mHandler.obtainMessage(CMD_START_SOCKET_KEEPALIVE, slot,













                (int) intervalSeconds, packet);















        startSocketKeepalive(msg);















        msg.recycle();















    }

































core/java/android/net/NetworkCapabilities.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1177,7 +1177,7 @@ public final class NetworkCapabilities implements Parcelable {













    }































    private boolean satisfiedBySpecifier(NetworkCapabilities nc) {













        return mNetworkSpecifier == null || mNetworkSpecifier.satisfiedBy(nc.mNetworkSpecifier)













        return mNetworkSpecifier == null || mNetworkSpecifier.canBeSatisfiedBy(nc.mNetworkSpecifier)















                || nc.mNetworkSpecifier instanceof MatchAllNetworkSpecifier;















    }

















































core/java/android/net/NetworkRequest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -474,7 +474,7 @@ public class NetworkRequest implements Parcelable {













     * @param nc Capabilities that should satisfy this NetworkRequest. null capabilities do not















     *           satisfy any request.















     */













    public boolean satisfiedBy(@Nullable NetworkCapabilities nc) {













    public boolean canBeSatisfiedBy(@Nullable NetworkCapabilities nc) {















        return networkCapabilities.satisfiedByNetworkCapabilities(nc);















    }