Bug 1113476: IDL patch - B2G RIL: support nsck/pck for SIM Lock types. r=edgar.
authorShawn Ku <sku@mozilla.com>
Thu, 08 Jan 2015 11:23:09 +0800
changeset 248467 20c767e2b07f1cc032d5f39a1d356943ca2a5c4e
parent 248466 26cd48766d6e333c3527861e98e6209851f95858
child 248468 48e799156c6995d01eb116882d746f20aef29fbe
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersedgar
bugs1113476
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1113476: IDL patch - B2G RIL: support nsck/pck for SIM Lock types. r=edgar.
dom/icc/Assertions.cpp
dom/icc/interfaces/nsIIccProvider.idl
--- a/dom/icc/Assertions.cpp
+++ b/dom/icc/Assertions.cpp
@@ -58,29 +58,33 @@ ASSERT_ICC_CARD_STATE_EQUALITY(Illegal, 
 #define ASSERT_ICC_LOCK_TYPE_EQUALITY(webidlState, xpidlState) \
   ASSERT_EQUALITY(IccLockType, webidlState, xpidlState)
 
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Pin, CARD_LOCK_TYPE_PIN);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Pin2, CARD_LOCK_TYPE_PIN2);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Puk, CARD_LOCK_TYPE_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Puk2, CARD_LOCK_TYPE_PUK2);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Nck, CARD_LOCK_TYPE_NCK);
+ASSERT_ICC_LOCK_TYPE_EQUALITY(Nsck, CARD_LOCK_TYPE_NSCK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Nck1, CARD_LOCK_TYPE_NCK1);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Nck2, CARD_LOCK_TYPE_NCK2);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Hnck, CARD_LOCK_TYPE_HNCK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Cck, CARD_LOCK_TYPE_CCK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Spck, CARD_LOCK_TYPE_SPCK);
+ASSERT_ICC_LOCK_TYPE_EQUALITY(Pck, CARD_LOCK_TYPE_PCK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Rcck, CARD_LOCK_TYPE_RCCK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Rspck, CARD_LOCK_TYPE_RSPCK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(NckPuk, CARD_LOCK_TYPE_NCK_PUK);
+ASSERT_ICC_LOCK_TYPE_EQUALITY(NsckPuk, CARD_LOCK_TYPE_NSCK_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Nck1Puk, CARD_LOCK_TYPE_NCK1_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Nck2Puk, CARD_LOCK_TYPE_NCK2_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(HnckPuk, CARD_LOCK_TYPE_HNCK_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(CckPuk, CARD_LOCK_TYPE_CCK_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(SpckPuk, CARD_LOCK_TYPE_SPCK_PUK);
+ASSERT_ICC_LOCK_TYPE_EQUALITY(PckPuk, CARD_LOCK_TYPE_PCK_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(RcckPuk, CARD_LOCK_TYPE_RCCK_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(RspckPuk, CARD_LOCK_TYPE_RSPCK_PUK);
 ASSERT_ICC_LOCK_TYPE_EQUALITY(Fdn, CARD_LOCK_TYPE_FDN);
 
 #undef ASSERT_ICC_LOCK_TYPE_EQUALITY
 
 /**
  * Enum IccContactType
--- a/dom/icc/interfaces/nsIIccProvider.idl
+++ b/dom/icc/interfaces/nsIIccProvider.idl
@@ -53,17 +53,17 @@ interface nsIIccChannelCallback : nsISup
    *
    */
   void notifyError(in DOMString error);
 };
 
 /**
  * XPCOM component (in the content process) that provides the ICC information.
  */
-[scriptable, uuid(821bda2b-7abd-44c6-813e-d4bc68d73a0c)]
+[scriptable, uuid(a203cd2e-2280-4d8e-a687-42b745d322c1)]
 interface nsIIccProvider : nsISupports
 {
   // MUST match enum IccCardState in MozIcc.webidl!
   const unsigned long CARD_STATE_UNKNOWN = 0;
   const unsigned long CARD_STATE_READY = 1;
   const unsigned long CARD_STATE_PIN_REQUIRED = 2;
   const unsigned long CARD_STATE_PUK_REQUIRED = 3;
   const unsigned long CARD_STATE_PERMANENT_BLOCKED = 4;
@@ -96,32 +96,36 @@ interface nsIIccProvider : nsISupports
   const unsigned long CARD_STATE_UNDETECTED = 4294967295; // UINT32_MAX
 
   // MUST match with enum IccLockType in MozIcc.webidl
   const unsigned long CARD_LOCK_TYPE_PIN = 0;
   const unsigned long CARD_LOCK_TYPE_PIN2 = 1;
   const unsigned long CARD_LOCK_TYPE_PUK = 2;
   const unsigned long CARD_LOCK_TYPE_PUK2 = 3;
   const unsigned long CARD_LOCK_TYPE_NCK = 4;
-  const unsigned long CARD_LOCK_TYPE_NCK1 = 5;
-  const unsigned long CARD_LOCK_TYPE_NCK2 = 6;
-  const unsigned long CARD_LOCK_TYPE_HNCK = 7;
-  const unsigned long CARD_LOCK_TYPE_CCK = 8;
-  const unsigned long CARD_LOCK_TYPE_SPCK = 9;
-  const unsigned long CARD_LOCK_TYPE_RCCK = 10;
-  const unsigned long CARD_LOCK_TYPE_RSPCK = 11;
-  const unsigned long CARD_LOCK_TYPE_NCK_PUK = 12;
-  const unsigned long CARD_LOCK_TYPE_NCK1_PUK = 13;
-  const unsigned long CARD_LOCK_TYPE_NCK2_PUK = 14;
-  const unsigned long CARD_LOCK_TYPE_HNCK_PUK = 15;
-  const unsigned long CARD_LOCK_TYPE_CCK_PUK = 16;
-  const unsigned long CARD_LOCK_TYPE_SPCK_PUK = 17;
-  const unsigned long CARD_LOCK_TYPE_RCCK_PUK = 18;
-  const unsigned long CARD_LOCK_TYPE_RSPCK_PUK = 19;
-  const unsigned long CARD_LOCK_TYPE_FDN = 20;
+  const unsigned long CARD_LOCK_TYPE_NSCK = 5;
+  const unsigned long CARD_LOCK_TYPE_NCK1 = 6;
+  const unsigned long CARD_LOCK_TYPE_NCK2 = 7;
+  const unsigned long CARD_LOCK_TYPE_HNCK = 8;
+  const unsigned long CARD_LOCK_TYPE_CCK = 9;
+  const unsigned long CARD_LOCK_TYPE_SPCK = 10;
+  const unsigned long CARD_LOCK_TYPE_PCK = 11;
+  const unsigned long CARD_LOCK_TYPE_RCCK = 12;
+  const unsigned long CARD_LOCK_TYPE_RSPCK = 13;
+  const unsigned long CARD_LOCK_TYPE_NCK_PUK = 14;
+  const unsigned long CARD_LOCK_TYPE_NSCK_PUK = 15;
+  const unsigned long CARD_LOCK_TYPE_NCK1_PUK = 16;
+  const unsigned long CARD_LOCK_TYPE_NCK2_PUK = 17;
+  const unsigned long CARD_LOCK_TYPE_HNCK_PUK = 18;
+  const unsigned long CARD_LOCK_TYPE_CCK_PUK = 19;
+  const unsigned long CARD_LOCK_TYPE_SPCK_PUK = 20;
+  const unsigned long CARD_LOCK_TYPE_PCK_PUK = 21;
+  const unsigned long CARD_LOCK_TYPE_RCCK_PUK = 22;
+  const unsigned long CARD_LOCK_TYPE_RSPCK_PUK = 23;
+  const unsigned long CARD_LOCK_TYPE_FDN = 24;
 
   // MUST match with enum IccContactType in MozIcc.webidl
   const unsigned long CARD_CONTACT_TYPE_ADN = 0;
   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;