Bug 1033142 - Part 2: add support for mvno type 'gid' in matchMvno() function. r=hsinyi

dom/system/gonk/RadioInterfaceLayer.js

@@ -2321,6 +2321,27 @@ RadioInterface.prototype = {
           }
           message.result = spn == message.mvnoData;
           break;
+        case "gid":
+          this.workerMessenger.send("getGID1", null, (function(response) {
+            let gid = response.gid1;
+            let mvnoDataLength = message.mvnoData.length;
+
+            if (!gid) {
+              message.errorMsg = RIL.GECKO_ERROR_GENERIC_FAILURE;
+            } else if (mvnoDataLength > gid.length) {
+              message.result = false;
+            } else {
+              message.result =
+                gid.substring(0, mvnoDataLength).toLowerCase() ==
+                message.mvnoData.toLowerCase();
+            }
+
+            target.sendAsyncMessage("RIL:MatchMvno", {
+              clientId: this.clientId,
+              data: message
+            });
+          }).bind(this));
+          return;
         default:
           message.errorMsg = RIL.GECKO_ERROR_MODE_NOT_SUPPORTED;
       }

dom/system/gonk/ril_worker.js

@@ -1019,6 +1019,14 @@ RilObject.prototype = {
     Buf.sendParcel();
   },
 
+  /**
+   * Retrieve ICC's GID1 field.
+   */
+  getGID1: function(options) {
+    options.gid1 = this.iccInfoPrivate.gid1;
+    this.sendChromeMessage(options);
+  },
+
   /**
    * Read UICC Phonebook contacts.
    *