Bug 1262591; Need to put unused function in ANDROID #ifdef; r=bustage a=lizzard
authorMichael Kaply <mozilla@kaply.com>
Mon, 11 Apr 2016 14:06:35 -0500
changeset 325851 de4e9975004c419dcb567f61041f18e13df1cecd
parent 325850 b6784814b6dd151cac00f7e9a4aeffbb4e422ad2
child 325852 8298e05ae1bdbdfdba9b14632bf81226d6e38956
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage, lizzard
bugs1262591
milestone47.0a2
Bug 1262591; Need to put unused function in ANDROID #ifdef; r=bustage a=lizzard MozReview-Commit-ID: 6Fm41vSnwTZ
netwerk/protocol/http/nsHttpHandler.cpp
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -118,27 +118,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()