Backed out changeset 7c07214ac152 (bug 1181479)

dothq · Sep 23, 2015 · 5d6ede5 · 5d6ede5
1 parent 8266b6d
commit 5d6ede5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/dom/bluetooth/bluedroid/BluetoothGattManager.cpp b/dom/bluetooth/bluedroid/BluetoothGattManager.cpp
@@ -617,11 +617,7 @@ BluetoothGattManager::StartLeScan(const nsTArray<nsString>& aServiceUuids,
   ENSURE_GATT_INTF_IS_READY_VOID(aRunnable);
 
   nsString appUuidStr;
-  if (NS_WARN_IF(NS_FAILED(GenerateUuid(appUuidStr))) || appUuidStr.IsEmpty()) {
-    DispatchReplyError(aRunnable,
-                       NS_LITERAL_STRING("start LE scan failed"));
-    return;
-  }
+  GenerateUuid(appUuidStr);
 
   size_t index = sClients->IndexOf(appUuidStr, 0 /* Start */, UuidComparator());
 

diff --git a/dom/bluetooth/common/BluetoothUtils.cpp b/dom/bluetooth/common/BluetoothUtils.cpp
@@ -67,17 +67,17 @@ StringToUuid(const nsAString& aString, BluetoothUuid& aUuid)
   memcpy(&aUuid.mUuid[14], &uuid5, sizeof(uint16_t));
 }
 
-nsresult
+void
 GenerateUuid(nsAString &aUuidString)
 {
   nsresult rv;
   nsCOMPtr<nsIUUIDGenerator> uuidGenerator =
     do_GetService("@mozilla.org/uuid-generator;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_SUCCESS_VOID(rv);
 
   nsID uuid;
   rv = uuidGenerator->GenerateUUIDInPlace(&uuid);
-  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_SUCCESS_VOID(rv);
 
   // Build a string in {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx} format
   char uuidBuffer[NSID_LENGTH];
@@ -86,8 +86,6 @@ GenerateUuid(nsAString &aUuidString)
 
   // Remove {} and the null terminator
   aUuidString.Assign(Substring(uuidString, 1, NSID_LENGTH - 3));
-
-  return NS_OK;
 }
 
 void

diff --git a/dom/bluetooth/common/BluetoothUtils.h b/dom/bluetooth/common/BluetoothUtils.h
@@ -43,7 +43,7 @@ StringToUuid(const nsAString& aString, BluetoothUuid& aUuid);
  *
  * @param aUuidString [out] String to store the generated uuid.
  */
-nsresult
+void
 GenerateUuid(nsAString &aUuidString);
 
 //

diff --git a/dom/bluetooth/common/webapi/BluetoothGatt.cpp b/dom/bluetooth/common/webapi/BluetoothGatt.cpp
@@ -113,8 +113,8 @@ BluetoothGatt::Connect(ErrorResult& aRv)
   BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   if (mAppUuid.IsEmpty()) {
-    nsresult rv = GenerateUuid(mAppUuid);
-    BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(rv) && !mAppUuid.IsEmpty(),
+    GenerateUuid(mAppUuid);
+    BT_ENSURE_TRUE_REJECT(!mAppUuid.IsEmpty(),
                           promise,
                           NS_ERROR_DOM_OPERATION_ERR);
     RegisterBluetoothSignalHandler(mAppUuid, this);

diff --git a/dom/bluetooth/common/webapi/BluetoothGattServer.cpp b/dom/bluetooth/common/webapi/BluetoothGattServer.cpp
@@ -137,8 +137,8 @@ BluetoothGattServer::Connect(const nsAString& aAddress, ErrorResult& aRv)
   BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE);
 
   if (mAppUuid.IsEmpty()) {
-    nsresult rv = GenerateUuid(mAppUuid);
-    BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(rv) && !mAppUuid.IsEmpty(),
+    GenerateUuid(mAppUuid);
+    BT_ENSURE_TRUE_REJECT(!mAppUuid.IsEmpty(),
                           promise,
                           NS_ERROR_DOM_OPERATION_ERR);
     RegisterBluetoothSignalHandler(mAppUuid, this);
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ StringToUuid(const nsAString& aString, BluetoothUuid& aUuid); @@
      *
      * @param aUuidString [out] String to store the generated uuid.
      */
-    nsresult
+    void
     GenerateUuid(nsAString &aUuidString);
     //
@@ Expand Down @@