From 483bf1be7aaedb26ecde542e36bf482cb667e04b Mon Sep 17 00:00:00 2001
From: Simo Kinnunen <simo@shoqolate.com>
Date: Mon, 3 Feb 2014 03:13:01 +0900
Subject: [PATCH] Default to null operator if none can be found. Easier to work
 with than undefined.

---
 lib/util/devutil.js | 2 +-
 lib/wire/wire.proto | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util/devutil.js b/lib/util/devutil.js
index 151a4f4f..b9fdb225 100644
--- a/lib/util/devutil.js
+++ b/lib/util/devutil.js
@@ -173,7 +173,7 @@ devutil.makeIdentity = function(serial, properties) {
     serial: serial
   , platform: 'Android'
   , manufacturer: manufacturer.toUpperCase()
-  , operator: operator
+  , operator: operator || null
   , model: model
   , version: version
   , abi: abi
diff --git a/lib/wire/wire.proto b/lib/wire/wire.proto
index c9c688f0..8b430a89 100644
--- a/lib/wire/wire.proto
+++ b/lib/wire/wire.proto
@@ -74,7 +74,7 @@ message DeviceIdentityMessage {
   required string serial = 1;
   required string platform = 2;
   required string manufacturer = 3;
-  required string operator = 4;
+  optional string operator = 4;
   required string model = 5;
   required string version = 6;
   required string abi = 7;