commit f9cb86aebe9647e0fe0137fc198ba16c017445c6
author Robert Greenwalt <rgreenwalt@google.com> Tue Apr 08 17:34:00 2014 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Mon May 12 16:52:56 2014 -0700
tree 5f7d1e0ab2f48cb39092881266f21f7e11ea33b3
parent 6681e32fff77174b1b93557c08d1fd00375422c0

Replace LinkCapabilities with NetworkCapabilities

Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 4ea33db..c1ffd56 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1117,7 +1117,7 @@
                 if (tracker != null) {
                     final NetworkInfo info = getFilteredNetworkInfo(tracker, uid);
                     result.add(new NetworkState(
-                            info, tracker.getLinkProperties(), tracker.getLinkCapabilities()));
+                            info, tracker.getLinkProperties(), tracker.getNetworkCapabilities()));
                 }
             }
         }
@@ -1129,7 +1129,7 @@
             final NetworkStateTracker tracker = mNetTrackers[networkType];
             if (tracker != null) {
                 return new NetworkState(tracker.getNetworkInfo(), tracker.getLinkProperties(),
-                        tracker.getLinkCapabilities());
+                        tracker.getNetworkCapabilities());
             }
         }
         return null;