Bug 1262591; Need to put unused function in ANDROID #ifdef; r=bustage
authorMichael Kaply <mozilla@kaply.com>
Mon, 11 Apr 2016 14:06:35 -0500
changeset 330508 039b504d1161b427ab475451bc805da8cd014b4c
parent 330507 5b37f138e5bfdb84fe3460dd115ec225933e0f5f
child 330509 922682fb9d2af91a2eaea50c65a6fabfd716a56c
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1262591
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1262591; Need to put unused function in ANDROID #ifdef; r=bustage
netwerk/protocol/http/nsHttpHandler.cpp
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -121,27 +121,29 @@ NewURI(const nsACString &aSpec,
     if (NS_FAILED(rv)) {
         return rv;
     }
 
     url.forget(aURI);
     return NS_OK;
 }
 
+#ifdef ANDROID
 static nsCString
 GetDeviceModelId() {
     nsCOMPtr<nsIPropertyBag2> infoService = do_GetService("@mozilla.org/system-info;1");
     MOZ_ASSERT(infoService, "Could not find a system info service");
     nsAutoString androidDevice;
     nsresult rv = infoService->GetPropertyAsAString(NS_LITERAL_STRING("device"), androidDevice);
     if (NS_SUCCEEDED(rv)) {
         return NS_LossyConvertUTF16toASCII(androidDevice);
     }
     return EmptyCString();
 }
+#endif
 
 //-----------------------------------------------------------------------------
 // nsHttpHandler <public>
 //-----------------------------------------------------------------------------
 
 nsHttpHandler *gHttpHandler = nullptr;
 
 nsHttpHandler::nsHttpHandler()