Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge

diff --cc core/java/android/net/IConnectivityManager.aidl
index c07e900,1c38314..a6f10ec
--- 1/core/java/android/net/IConnectivityManager.aidl
--- 2/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@@ -149,11 -147,10 +149,11 @@@ interface IConnectivityManage
  
      String getMobileRedirectedProvisioningUrl();
  
-     LinkInfo getLinkInfo(int networkType);
+     LinkQualityInfo getLinkQualityInfo(int networkType);
  
-     LinkInfo getActiveLinkInfo();
+     LinkQualityInfo getActiveLinkQualityInfo();
  
-     LinkInfo[] getAllLinkInfo();
+     LinkQualityInfo[] getAllLinkQualityInfo();
  
 +    void setProvisioningNotificationVisible(boolean visible, int networkType, in String extraInfo, in String url);
  }

diff --cc core/java/android/net/MobileDataStateTracker.java
Simple merge

diff --cc services/java/com/android/server/ConnectivityService.java
Simple merge