diff --git a/lib/db/api.js b/lib/db/api.js index 50c2f1dc..a4e11931 100644 --- a/lib/db/api.js +++ b/lib/db/api.js @@ -62,6 +62,7 @@ module.exports.saveDeviceIdentity = function(serial, identity) { return db.run(r.table('devices').get(serial).update({ platform: identity.platform , manufacturer: identity.manufacturer + , operator: identity.operator , model: identity.model , version: identity.version , abi: identity.abi diff --git a/lib/util/devutil.js b/lib/util/devutil.js index dae742c1..24680444 100644 --- a/lib/util/devutil.js +++ b/lib/util/devutil.js @@ -173,6 +173,7 @@ devutil.makeIdentity = function(serial, properties) { var model = properties['ro.product.model'] , brand = properties['ro.product.brand'] , manufacturer = properties['ro.product.manufacturer'] + , operator = properties['gsm.sim.operator.alpha'] , version = properties['ro.build.version.release'] , sdk = properties['ro.build.version.sdk'] , abi = properties['ro.product.cpu.abi'] @@ -194,6 +195,7 @@ devutil.makeIdentity = function(serial, properties) { serial: serial , platform: devutil.platform('android') , manufacturer: devutil.manufacturer(manufacturer) + , operator: operator , model: model , version: version , abi: abi diff --git a/lib/util/wireutil.js b/lib/util/wireutil.js index 446eb09e..53d63794 100644 --- a/lib/util/wireutil.js +++ b/lib/util/wireutil.js @@ -68,6 +68,7 @@ module.exports = function(wire) { serial , identity.platform , identity.manufacturer + , identity.operator , identity.model , identity.version , identity.abi diff --git a/lib/wire/wire.proto b/lib/wire/wire.proto index a5ec7cdd..d8195883 100644 --- a/lib/wire/wire.proto +++ b/lib/wire/wire.proto @@ -114,11 +114,12 @@ message DeviceIdentityMessage { required string serial = 1; required DevicePlatform platform = 2; required DeviceManufacturer manufacturer = 3; - required string model = 4; - required string version = 5; - required string abi = 6; - required string sdk = 7; - required DeviceDisplayMessage display = 8; + required string operator = 4; + required string model = 5; + required string version = 6; + required string abi = 7; + required string sdk = 8; + required DeviceDisplayMessage display = 9; } message DeviceProperty {