Merge m-c to inbound.

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "repo_path": "/integration/gaia-central",
-    "revision": "3f5bb84585fc"
+    "revision": "7a4b216668aebe56f71c17dde2ff619bfd005aa7", 
+    "repo_path": "/integration/gaia-central"
 }

dom/contacts/ContactManager.js

@@ -417,7 +417,9 @@ Contact.prototype = {
   },
 
   set bday(aBday) {
-    if (aBday !== undefined && aBday !== null) {
+    if (aBday instanceof Date) {
+      this._bday = aBday;
+    } else if (typeof aBday === "string" || typeof aBday === "number") {
       this._bday = new Date(aBday);
     }
   },
@@ -427,7 +429,9 @@ Contact.prototype = {
   },
 
   set anniversary(aAnniversary) {
-    if (aAnniversary !== undefined && aAnniversary !== null) {
+    if (aAnniversary instanceof Date) {
+      this._anniversary = aAnniversary;
+    } else if (typeof aAnniversary === "string" || typeof aAnniversary === "number") {
       this._anniversary = new Date(aAnniversary);
     }
   },

dom/devicestorage/DeviceStorage.h

@@ -224,6 +224,8 @@ public:
   already_AddRefed<DOMRequest> UsedSpace(ErrorResult& aRv);
   already_AddRefed<DOMRequest> Available(ErrorResult& aRv);
 
+  bool Default();
+
   // Uses XPCOM GetStorageName
 
   static void CreateDeviceStorageFor(nsPIDOMWindow* aWin,

dom/devicestorage/nsDeviceStorage.cpp

@@ -3043,11 +3043,18 @@ nsDOMDeviceStorage::GetRootDirectoryForFile(const nsAString& aName, nsIFile** aR
   return ds->mRootDirectory->Clone(aRootDirectory);
 }
 
-NS_IMETHODIMP
-nsDOMDeviceStorage::GetDefault(bool* aDefault) {
+bool
+nsDOMDeviceStorage::Default()
+{
   nsString defaultStorageName;
   GetWritableStorageName(mStorageType, defaultStorageName);
-  *aDefault = mStorageName.Equals(defaultStorageName);
+  return mStorageName.Equals(defaultStorageName);
+}
+
+NS_IMETHODIMP
+nsDOMDeviceStorage::GetDefault(bool* aDefault)
+{
+  *aDefault = Default();
   return NS_OK;
 }
 

dom/system/gonk/NetworkManager.js

@@ -259,8 +259,8 @@ NetworkManager.prototype = {
         break;
       case TOPIC_INTERFACE_REGISTERED:
         let regNetwork = subject.QueryInterface(Ci.nsINetworkInterface);
-        debug("Network '" + regNetwork.name + "' registered, adding mmsproxy and/or mmsc route");
         if (regNetwork.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS) {
+          debug("Network '" + regNetwork.name + "' registered, adding mmsproxy and/or mmsc route");
 	  let mmsHosts = this.resolveHostname(
 	      [ Services.prefs.getCharPref("ril.mms.mmsproxy"),
                 Services.prefs.getCharPref("ril.mms.mmsc") ]
@@ -270,8 +270,8 @@ NetworkManager.prototype = {
         break;
       case TOPIC_INTERFACE_UNREGISTERED:
         let unregNetwork = subject.QueryInterface(Ci.nsINetworkInterface);
-        debug("Network '" + regNetwork.name + "' unregistered, removing mmsproxy and/or mmsc route");
         if (unregNetwork.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS) {
+          debug("Network '" + unregNetwork.name + "' unregistered, removing mmsproxy and/or mmsc route");
 	  let mmsHosts = this.resolveHostname(
 	      [ Services.prefs.getCharPref("ril.mms.mmsproxy"),
                 Services.prefs.getCharPref("ril.mms.mmsc") ]

dom/webidl/DeviceStorage.webidl

@@ -44,4 +44,8 @@ interface DeviceStorage : EventTarget {
   // Note that the storageName is just a name (like sdcard), and doesn't
   // include any path information.
   readonly attribute DOMString storageName;
+
+  // Determines if this storage area is the one which will be used by default
+  // for storing new files.
+  readonly attribute boolean default;
 };