Bug 691054 - Back out bug 667980 (getNetworkLinkType) on Android because of scary permissions [r=dougt]

2011-10-03 16:34:43 -07:00
parent 563d1dda70
commit 50a726550f
11 changed files with 28 additions and 180 deletions
--- a/netwerk/system/android/nsAndroidNetworkLinkService.cpp
+++ b/netwerk/system/android/nsAndroidNetworkLinkService.cpp
@@ -80,8 +80,8 @@ NS_IMETHODIMP
 nsAndroidNetworkLinkService::GetLinkType(PRUint32 *aLinkType)
 {
  NS_ENSURE_ARG_POINTER(aLinkType);
-  NS_ENSURE_TRUE(mozilla::AndroidBridge::Bridge(), NS_ERROR_UNEXPECTED);

-  *aLinkType = mozilla::AndroidBridge::Bridge()->GetNetworkLinkType();
+  // XXX This function has not yet been implemented for this platform
+  *aLinkType = nsINetworkLinkService::LINK_TYPE_UNKNOWN;
  return NS_OK;
 }