Commit 044738c1 authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge b2g-inbound to m-c.

parents 9d5f8da8 1bccf6fc

b2g/app/b2g.js

+0 −3
Original line number Diff line number Diff line
@@ -802,10 +802,7 @@ pref("dom.datastore.enabled", true); 
#endif



// DOM Inter-App Communication API.

#ifdef MOZ_WIDGET_GONK

// Enable this only for gonk-specific build but not for desktop build.

pref("dom.inter-app-communication-api.enabled", true);

#endif



// Allow ADB to run for this many hours before disabling

// (only applies when marionette is disabled)

b2g/config/gaia.json

+1 −1
Original line number Diff line number Diff line 
{

    "revision": "36aa3e5d226a844b07b3e4b2219f54b549456ec1", 

    "revision": "86e06b1db110e34eb66826d3b1bdee3a5d57b3a7", 

    "repo_path": "/integration/gaia-central"

}

dom/camera/DOMCameraManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -66,8 +66,10 @@ nsDOMCameraManager::~nsDOMCameraManager() 
  /* destructor code */

  DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);

  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();

  if (obs) {

    obs->RemoveObserver(this, "xpcom-shutdown");

  }

}



bool

nsDOMCameraManager::CheckPermission(nsPIDOMWindow* aWindow)

dom/contacts/fallback/ContactDB.jsm

+17 −0
Original line number Diff line number Diff line
@@ -1062,6 +1062,23 @@ ContactDB.prototype = { 
              substringResult[event.target.result[i].id] = event.target.result[i];

            }

          }.bind(this);

        } else if (normalized[0] !== "+") {

          // We might have an international prefix like '00'

          let parsed = PhoneNumberUtils.parse(normalized);

          if (parsed && parsed.internationalNumber &&

              parsed.nationalNumber  &&

              parsed.nationalNumber !== normalized &&

              parsed.internationalNumber !== normalized) {

            if (DEBUG) debug("Search with " + parsed.internationalNumber);

            let prefixRequest = index.mozGetAll(parsed.internationalNumber, limit);



            prefixRequest.onsuccess = function (event) {

              if (DEBUG) debug("Request successful. Record count: " + event.target.result.length);

              for (let i in event.target.result) {

                substringResult[event.target.result[i].id] = event.target.result[i];

              }

            }.bind(this);

          }

        }



        request = index.mozGetAll(normalized, limit);

dom/contacts/tests/test_contacts_international.html

+45 −0
Original line number Diff line number Diff line
@@ -61,6 +61,16 @@ var properties2 = { 
  tel: [{type: ["work"], value: shortNumber, carrier: "testCarrier"}]

};



var number3 = {

  international1: "0041557932012345",

  international2: "+557932012345"

};



var properties3 = {

  name: "Testname2",

  tel: [{value: number3.international2}]

};



var req;

var index = 0;

var createResult1;
@@ -237,6 +247,41 @@ var steps = [ 
    }

    req.onerror = onFailure;

  },

  function () {

    ok(true, "Adding a new contact with country code");

    createResult1 = new mozContact();

    createResult1.init(properties3);

    req = navigator.mozContacts.save(createResult1);

    req.onsuccess = function () {

      ok(createResult1.id, "The contact now has an ID.");

      sample_id1 = createResult1.id;

      next();

    };

    req.onerror = onFailure;

  },

  function () {

    ok(true, "Searching for international number with prefix");

    var options = {filterBy: ["tel"],

                   filterOp: "match",

                   filterValue: number3.international1};

    req = mozContacts.find(options);

    req.onsuccess = function () {

      ok(req.result.length == 1, "Found exactly 1 contact.");

      findResult1 = req.result[0];

      ok(findResult1.id == sample_id1, "Same ID");

      next();

    };

    req.onerror = onFailure;

  },

  function () {

    ok(true, "Deleting database");

    req = mozContacts.clear();

    req.onsuccess = function () {

      ok(true, "Deleted the database");

      next();

    }

    req.onerror = onFailure;

  },

  function () {

    ok(true, "all done!\n");

    SimpleTest.finish();