LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace LinkCapabilities with NetworkCapabilities

Browse Source 
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
This commit is contained in:
Robert Greenwalt
2014-04-08 17:34:00 -07:00
parent 6b0e2a98e4
commit 4d97cb04ba
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/net/NetworkState.java
View File

@@ -28,21 +28,21 @@ public class NetworkState implements Parcelable {
public final NetworkInfo networkInfo; public final NetworkInfo networkInfo;
public final LinkProperties linkProperties; public final LinkProperties linkProperties;
public final LinkCapabilities linkCapabilities; public final NetworkCapabilities networkCapabilities;
/** Currently only used by testing. */ /** Currently only used by testing. */
public final String subscriberId; public final String subscriberId;
public final String networkId; public final String networkId;
public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties, public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,
LinkCapabilities linkCapabilities) { NetworkCapabilities networkCapabilities) {
this(networkInfo, linkProperties, linkCapabilities, null, null); this(networkInfo, linkProperties, networkCapabilities, null, null);
} }
public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties, public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,
LinkCapabilities linkCapabilities, String subscriberId, String networkId) { NetworkCapabilities networkCapabilities, String subscriberId, String networkId) {
this.networkInfo = networkInfo; this.networkInfo = networkInfo;
this.linkProperties = linkProperties; this.linkProperties = linkProperties;
this.linkCapabilities = linkCapabilities; this.networkCapabilities = networkCapabilities;
this.subscriberId = subscriberId; this.subscriberId = subscriberId;
this.networkId = networkId; this.networkId = networkId;
} }
@@ -50,7 +50,7 @@ public class NetworkState implements Parcelable {
public NetworkState(Parcel in) { public NetworkState(Parcel in) {
networkInfo = in.readParcelable(null); networkInfo = in.readParcelable(null);
linkProperties = in.readParcelable(null); linkProperties = in.readParcelable(null);
linkCapabilities = in.readParcelable(null); networkCapabilities = in.readParcelable(null);
subscriberId = in.readString(); subscriberId = in.readString();
networkId = in.readString(); networkId = in.readString();
} }
@@ -64,7 +64,7 @@ public class NetworkState implements Parcelable {
public void writeToParcel(Parcel out, int flags) { public void writeToParcel(Parcel out, int flags) {
out.writeParcelable(networkInfo, flags); out.writeParcelable(networkInfo, flags);
out.writeParcelable(linkProperties, flags); out.writeParcelable(linkProperties, flags);
out.writeParcelable(linkCapabilities, flags); out.writeParcelable(networkCapabilities, flags);
out.writeString(subscriberId); out.writeString(subscriberId);
out.writeString(networkId); out.writeString(networkId);
} }

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1117,7 +1117,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (tracker != null) { if (tracker != null) {
final NetworkInfo info = getFilteredNetworkInfo(tracker, uid); final NetworkInfo info = getFilteredNetworkInfo(tracker, uid);
result.add(new NetworkState( result.add(new NetworkState(
info, tracker.getLinkProperties(), tracker.getLinkCapabilities())); info, tracker.getLinkProperties(), tracker.getNetworkCapabilities()));
} }
} }
} }
@@ -1129,7 +1129,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
final NetworkStateTracker tracker = mNetTrackers[networkType]; final NetworkStateTracker tracker = mNetTrackers[networkType];
if (tracker != null) { if (tracker != null) {
return new NetworkState(tracker.getNetworkInfo(), tracker.getLinkProperties(), return new NetworkState(tracker.getNetworkInfo(), tracker.getLinkProperties(),
tracker.getLinkCapabilities()); tracker.getNetworkCapabilities());
} }
} }
return null; return null;