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

Commit 0ed49867 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge changes from topic "networkagent" 

* changes:
  Add a Builder to NetworkAgentConfig, and make it SystemApi.
  Rename NetworkMisc to NetworkAgentConfig.
parents a11ae54b d5ad4726

api/system-current.txt

+17 −0
Original line number Diff line number Diff line
@@ -4482,6 +4482,23 @@ package android.net { 
    field public final int netId;

  }













  public final class NetworkAgentConfig implements android.os.Parcelable {













    method public int describeContents();













    method @Nullable public String getSubscriberId();













    method public boolean isNat64DetectionEnabled();













    method public boolean isProvisioningNotificationEnabled();













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













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













  }

























  public static class NetworkAgentConfig.Builder {













    ctor public NetworkAgentConfig.Builder();













    method @NonNull public android.net.NetworkAgentConfig build();













    method @NonNull public android.net.NetworkAgentConfig.Builder disableNat64Detection();













    method @NonNull public android.net.NetworkAgentConfig.Builder disableProvisioningNotification();













    method @NonNull public android.net.NetworkAgentConfig.Builder setSubscriberId(@Nullable String);













  }



























  public final class NetworkCapabilities implements android.os.Parcelable {















    method public boolean deduceRestrictedCapability();















    method @NonNull public int[] getTransportTypes();

































core/java/android/net/ConnectivityManager.java



+5
−4




























Original line number
Diff line number
Diff line








@@ -3173,8 +3173,8 @@ public class ConnectivityManager {













     */















    @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY)















    public Network registerNetworkAgent(Messenger messenger, NetworkInfo ni, LinkProperties lp,













            NetworkCapabilities nc, int score, NetworkMisc misc) {













        return registerNetworkAgent(messenger, ni, lp, nc, score, misc, NetworkProvider.ID_NONE);













            NetworkCapabilities nc, int score, NetworkAgentConfig config) {













        return registerNetworkAgent(messenger, ni, lp, nc, score, config, NetworkProvider.ID_NONE);















    }































    /**









@@ -3184,9 +3184,10 @@ public class ConnectivityManager {













     */















    @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY)















    public Network registerNetworkAgent(Messenger messenger, NetworkInfo ni, LinkProperties lp,













            NetworkCapabilities nc, int score, NetworkMisc misc, int providerId) {













            NetworkCapabilities nc, int score, NetworkAgentConfig config, int providerId) {





























        try {













            return mService.registerNetworkAgent(messenger, ni, lp, nc, score, misc, providerId);













            return mService.registerNetworkAgent(messenger, ni, lp, nc, score, config, providerId);















        } catch (RemoteException e) {















            throw e.rethrowFromSystemServer();















        }

































core/java/android/net/IConnectivityManager.aidl



+3
−2




























Original line number
Diff line number
Diff line








@@ -20,9 +20,9 @@ import android.app.PendingIntent;













import android.net.ConnectionInfo;















import android.net.LinkProperties;















import android.net.Network;













import android.net.NetworkAgentConfig;















import android.net.NetworkCapabilities;















import android.net.NetworkInfo;













import android.net.NetworkMisc;















import android.net.NetworkQuotaInfo;















import android.net.NetworkRequest;















import android.net.NetworkState;










@@ -153,7 +153,8 @@ interface IConnectivityManager













    void declareNetworkRequestUnfulfillable(in NetworkRequest request);































    Network registerNetworkAgent(in Messenger messenger, in NetworkInfo ni, in LinkProperties lp,













            in NetworkCapabilities nc, int score, in NetworkMisc misc, in int factorySerialNumber);













            in NetworkCapabilities nc, int score, in NetworkAgentConfig config,













            in int factorySerialNumber);































    NetworkRequest requestNetwork(in NetworkCapabilities networkCapabilities,















            in Messenger messenger, int timeoutSec, in IBinder binder, int legacy);

































core/java/android/net/NetworkAgent.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -221,8 +221,8 @@ public abstract class NetworkAgent {













        this(looper, context, logTag, ni, nc, lp, score, null, NetworkProvider.ID_NONE);















    }















    public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,













            NetworkCapabilities nc, LinkProperties lp, int score, NetworkMisc misc) {













        this(looper, context, logTag, ni, nc, lp, score, misc, NetworkProvider.ID_NONE);













            NetworkCapabilities nc, LinkProperties lp, int score, NetworkAgentConfig config) {













        this(looper, context, logTag, ni, nc, lp, score, config, NetworkProvider.ID_NONE);















    }































    public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,









@@ -231,7 +231,7 @@ public abstract class NetworkAgent {













    }































    public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,













            NetworkCapabilities nc, LinkProperties lp, int score, NetworkMisc misc,













            NetworkCapabilities nc, LinkProperties lp, int score, NetworkAgentConfig config,















            int providerId) {















        mHandler = new NetworkAgentHandler(looper);















        LOG_TAG = logTag;









@@ -245,7 +245,7 @@ public abstract class NetworkAgent {













        ConnectivityManager cm = (ConnectivityManager)mContext.getSystemService(















                Context.CONNECTIVITY_SERVICE);















        network = cm.registerNetworkAgent(new Messenger(mHandler), new NetworkInfo(ni),













                new LinkProperties(lp), new NetworkCapabilities(nc), score, misc,













                new LinkProperties(lp), new NetworkCapabilities(nc), score, config,















                providerId);















    }

















































core/java/android/net/NetworkMisc.aidl→core/java/android/net/NetworkAgentConfig.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -16,4 +16,4 @@





























package android.net;





























parcelable NetworkMisc;












parcelable NetworkAgentConfig;