diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index e63a056a3894..333fefe2317e 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 7820a78821d5..08e844c305e8 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,13 +19,13 @@
-
+
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 3ba15f6b524e..b0b25c9491e6 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,10 +17,10 @@
-
+
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 278e9752ae3c..983feb7f7976 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 7820a78821d5..08e844c305e8 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,13 +19,13 @@
-
+
-
+
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 8991f934a22d..d42b40404dda 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index fbffd0f04583..f451ce43fa6f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,10 +17,10 @@
-
+
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 92dda06cf21d..981e662080e9 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
- "revision": "8db023189f8d58a474eaf31d25cbd56b711c5567",
+ "revision": "563db4265b0e312e0cae52479d55e55a0e6a1b5a",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 61e96e38218b..cf250b7885de 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,11 +17,11 @@
-
+
-
+
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 4904855ab156..d635599a0e04 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 0917e1ff3228..3469b09164ee 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,10 +17,10 @@
-
+
-
+
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 2397f6a864e9..83e9f71fb09b 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,12 +17,12 @@
-
+
-
+
diff --git a/dom/icc/Assertions.cpp b/dom/icc/Assertions.cpp
index 03f7148d88b1..4d4c76cf34cd 100644
--- a/dom/icc/Assertions.cpp
+++ b/dom/icc/Assertions.cpp
@@ -94,18 +94,6 @@ ASSERT_ICC_CONTACT_TYPE_EQUALITY(Sdn, CARD_CONTACT_TYPE_SDN);
#undef ASSERT_ICC_CONTACT_TYPE_EQUALITY
-/**
- * Enum IccMvnoType
- */
-#define ASSERT_ICC_MVNO_TYPE_EQUALITY(webidlState, xpidlState) \
- ASSERT_EQUALITY(IccMvnoType, webidlState, xpidlState)
-
-ASSERT_ICC_MVNO_TYPE_EQUALITY(Imsi, CARD_MVNO_TYPE_IMSI);
-ASSERT_ICC_MVNO_TYPE_EQUALITY(Spn, CARD_MVNO_TYPE_SPN);
-ASSERT_ICC_MVNO_TYPE_EQUALITY(Gid, CARD_MVNO_TYPE_GID);
-
-#undef ASSERT_ICC_MVNO_TYPE_EQUALITY
-
#undef ASSERT_EQUALITY
} // namespace icc
diff --git a/dom/icc/Icc.cpp b/dom/icc/Icc.cpp
index 4199df4f4656..c693837ae970 100644
--- a/dom/icc/Icc.cpp
+++ b/dom/icc/Icc.cpp
@@ -384,7 +384,8 @@ Icc::UpdateContact(const JSContext* aCx, IccContactType aContactType,
}
already_AddRefed
-Icc::MatchMvno(IccMvnoType aMvnoType, const nsAString& aMvnoData,
+Icc::MatchMvno(const nsAString& aMvnoType,
+ const nsAString& aMvnoData,
ErrorResult& aRv)
{
if (!mProvider) {
@@ -394,8 +395,8 @@ Icc::MatchMvno(IccMvnoType aMvnoType, const nsAString& aMvnoData,
nsRefPtr request;
nsresult rv = mProvider->MatchMvno(mClientId, GetOwner(),
- static_cast(aMvnoType),
- aMvnoData, getter_AddRefs(request));
+ aMvnoType, aMvnoData,
+ getter_AddRefs(request));
if (NS_FAILED(rv)) {
aRv.Throw(rv);
return nullptr;
diff --git a/dom/icc/Icc.h b/dom/icc/Icc.h
index cdc34ebe3975..4bf502480959 100644
--- a/dom/icc/Icc.h
+++ b/dom/icc/Icc.h
@@ -98,7 +98,7 @@ public:
ErrorResult& aRv);
already_AddRefed
- MatchMvno(IccMvnoType aMvnoType, const nsAString& aMatchData,
+ MatchMvno(const nsAString& aMvnoType, const nsAString& aMatchData,
ErrorResult& aRv);
IMPL_EVENT_HANDLER(iccinfochange)
diff --git a/dom/icc/interfaces/nsIIccProvider.idl b/dom/icc/interfaces/nsIIccProvider.idl
index 011d84be222a..7d7769129e0a 100644
--- a/dom/icc/interfaces/nsIIccProvider.idl
+++ b/dom/icc/interfaces/nsIIccProvider.idl
@@ -20,7 +20,7 @@ interface nsIIccListener : nsISupports
/**
* XPCOM component (in the content process) that provides the ICC information.
*/
-[scriptable, uuid(c3e3c1a9-6ac4-4916-a777-7d49ffd89c46)]
+[scriptable, uuid(937213c3-f64e-4f58-b4e0-3010f219d0c3)]
interface nsIIccProvider : nsISupports
{
// MUST match enum IccCardState in MozIcc.webidl!
@@ -85,11 +85,6 @@ interface nsIIccProvider : nsISupports
const unsigned long CARD_CONTACT_TYPE_FDN = 1;
const unsigned long CARD_CONTACT_TYPE_SDN = 2;
- // MUST match with enum IccMvnoType in MozIcc.webidl
- const unsigned long CARD_MVNO_TYPE_IMSI = 0;
- const unsigned long CARD_MVNO_TYPE_SPN = 1;
- const unsigned long CARD_MVNO_TYPE_GID = 2;
-
/**
* Called when a content process registers receiving unsolicited messages from
* RadioInterfaceLayer in the chrome process. Only a content process that has
@@ -187,6 +182,6 @@ interface nsIIccProvider : nsISupports
*/
nsIDOMDOMRequest matchMvno(in unsigned long clientId,
in nsIDOMWindow window,
- in unsigned long mvnoType,
+ in DOMString mvnoType,
in DOMString mvnoData);
};
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 246dfbcccaea..9dbf9746a31d 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -1993,20 +1993,20 @@ RadioInterface.prototype = {
matchMvno: function(target, message) {
if (DEBUG) this.debug("matchMvno: " + JSON.stringify(message));
- if (!message || !message.mvnoData) {
+ if (!message || !message.mvnoType || !message.mvnoData) {
message.errorMsg = RIL.GECKO_ERROR_INVALID_PARAMETER;
}
if (!message.errorMsg) {
switch (message.mvnoType) {
- case RIL.GECKO_CARDMVNO_TYPE_IMSI:
+ case "imsi":
if (!this.rilContext.imsi) {
message.errorMsg = RIL.GECKO_ERROR_GENERIC_FAILURE;
break;
}
message.result = this.isImsiMatches(message.mvnoData);
break;
- case RIL.GECKO_CARDMVNO_TYPE_SPN:
+ case "spn":
let spn = this.rilContext.iccInfo && this.rilContext.iccInfo.spn;
if (!spn) {
message.errorMsg = RIL.GECKO_ERROR_GENERIC_FAILURE;
@@ -2014,7 +2014,7 @@ RadioInterface.prototype = {
}
message.result = spn == message.mvnoData;
break;
- case RIL.GECKO_CARDMVNO_TYPE_GID:
+ case "gid":
this.workerMessenger.send("getGID1", null, (function(response) {
let gid = response.gid1;
let mvnoDataLength = message.mvnoData.length;
diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js
index 900c09dba804..56f2d5248ce4 100644
--- a/dom/system/gonk/ril_consts.js
+++ b/dom/system/gonk/ril_consts.js
@@ -2645,11 +2645,6 @@ this.GECKO_CARDCONTACT_TYPE_ADN = 0;
this.GECKO_CARDCONTACT_TYPE_FDN = 1;
this.GECKO_CARDCONTACT_TYPE_SDN = 2;
-// See nsIIccProvider::CARD_MVNO_TYPE_*
-this.GECKO_CARDMVNO_TYPE_IMSI = 0;
-this.GECKO_CARDMVNO_TYPE_SPN = 1;
-this.GECKO_CARDMVNO_TYPE_GID = 2;
-
// See ril.h RIL_PersoSubstate
this.PERSONSUBSTATE = {};
PERSONSUBSTATE[CARD_PERSOSUBSTATE_UNKNOWN] = GECKO_CARDSTATE_UNKNOWN;
diff --git a/dom/webidl/MozIcc.webidl b/dom/webidl/MozIcc.webidl
index 309b52249f19..f21ac6730b05 100644
--- a/dom/webidl/MozIcc.webidl
+++ b/dom/webidl/MozIcc.webidl
@@ -82,13 +82,6 @@ enum IccContactType
"sdn" // Service Dialling Number.
};
-enum IccMvnoType
-{
- "imsi",
- "spn",
- "gid"
-};
-
dictionary IccUnlockCardLockOptions
{
required IccLockType lockType;
@@ -322,13 +315,17 @@ interface MozIcc : EventTarget
*
* @param mvnoType
* Mvno type to use to compare the match data.
+ * Currently, we only support 'imsi'.
* @param matchData
* Data to be compared with ICC's field.
*
* @return a DOMRequest.
* The request's result will be a boolean indicating the matching
* result.
+ *
+ * TODO: change param mvnoType to WebIDL enum after Bug 864489 -
+ * B2G RIL: use ipdl as IPC in MozIccManager
*/
[Throws]
- DOMRequest matchMvno(IccMvnoType mvnoType, DOMString matchData);
+ DOMRequest matchMvno(DOMString mvnoType, DOMString matchData);
};
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 3c1cafb6ff71..1daf0b5e4cfc 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1422,7 +1422,6 @@ public abstract class GeckoApp
LayerView layerView = (LayerView) findViewById(R.id.layer_view);
layerView.initializeView(EventDispatcher.getInstance());
mLayerView = layerView;
- GeckoAppShell.setLayerView(layerView);
GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, layerView.getLayerClientObject()));
diff --git a/mobile/android/base/GeckoView.java b/mobile/android/base/GeckoView.java
index cb6d13ef9bac..f0be11ae873a 100644
--- a/mobile/android/base/GeckoView.java
+++ b/mobile/android/base/GeckoView.java
@@ -122,6 +122,9 @@ public class GeckoView extends LayerView
}
private void init(Context context, String url, boolean doInit) {
+ // Perform common initialization for Fennec/GeckoView.
+ GeckoAppShell.setLayerView(this);
+
// TODO: Fennec currently takes care of its own initialization, so this
// flag is a hack used in Fennec to prevent GeckoView initialization.
// This should go away once Fennec also uses GeckoView for
@@ -185,7 +188,6 @@ public class GeckoView extends LayerView
GeckoProfile profile = GeckoProfile.get(context).forceCreate();
BrowserDB.initialize(profile.getName());
- GeckoAppShell.setLayerView(this);
GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, getLayerClientObject()));
GeckoThread.createAndStart();
diff --git a/mobile/android/base/gfx/LayerView.java b/mobile/android/base/gfx/LayerView.java
index 156f3490465d..7b5fb380ea60 100644
--- a/mobile/android/base/gfx/LayerView.java
+++ b/mobile/android/base/gfx/LayerView.java
@@ -318,7 +318,6 @@ public class LayerView extends FrameLayout implements Tabs.OnTabsChangedListener
public void setInputConnectionHandler(InputConnectionHandler inputConnectionHandler) {
mInputConnectionHandler = inputConnectionHandler;
- mLayerClient.forceRedraw(null);
}
@Override