yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 10:19:30 +02:00
Code Issues Releases Wiki Activity

Add operator to device data.

Browse source
This commit is contained in:
Simo Kinnunen 2014-01-31 19:31:21 +09:00
parent 7c0e04c4b4
commit f173e6650a
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/db/api.js
View file

@ -62,6 +62,7 @@ module.exports.saveDeviceIdentity = function(serial, identity) {
return db.run(r.table('devices').get(serial).update({ return db.run(r.table('devices').get(serial).update({
platform: identity.platform platform: identity.platform
, manufacturer: identity.manufacturer , manufacturer: identity.manufacturer
, operator: identity.operator
, model: identity.model , model: identity.model
, version: identity.version , version: identity.version
, abi: identity.abi , abi: identity.abi

2
lib/util/devutil.js
View file

@ -173,6 +173,7 @@ devutil.makeIdentity = function(serial, properties) {
var model = properties['ro.product.model'] var model = properties['ro.product.model']
, brand = properties['ro.product.brand'] , brand = properties['ro.product.brand']
, manufacturer = properties['ro.product.manufacturer'] , manufacturer = properties['ro.product.manufacturer']
, operator = properties['gsm.sim.operator.alpha']
, version = properties['ro.build.version.release'] , version = properties['ro.build.version.release']
, sdk = properties['ro.build.version.sdk'] , sdk = properties['ro.build.version.sdk']
, abi = properties['ro.product.cpu.abi'] , abi = properties['ro.product.cpu.abi']
@ -194,6 +195,7 @@ devutil.makeIdentity = function(serial, properties) {
serial: serial serial: serial
, platform: devutil.platform('android') , platform: devutil.platform('android')
, manufacturer: devutil.manufacturer(manufacturer) , manufacturer: devutil.manufacturer(manufacturer)
, operator: operator
, model: model , model: model
, version: version , version: version
, abi: abi , abi: abi

1
lib/util/wireutil.js
View file

@ -68,6 +68,7 @@ module.exports = function(wire) {
serial serial
, identity.platform , identity.platform
, identity.manufacturer , identity.manufacturer
, identity.operator
, identity.model , identity.model
, identity.version , identity.version
, identity.abi , identity.abi

11
lib/wire/wire.proto
View file

@ -114,11 +114,12 @@ message DeviceIdentityMessage {
required string serial = 1; required string serial = 1;
required DevicePlatform platform = 2; required DevicePlatform platform = 2;
required DeviceManufacturer manufacturer = 3; required DeviceManufacturer manufacturer = 3;
required string model = 4; required string operator = 4;
required string version = 5; required string model = 5;
required string abi = 6; required string version = 6;
required string sdk = 7; required string abi = 7;
required DeviceDisplayMessage display = 8; required string sdk = 8;
required DeviceDisplayMessage display = 9;
} }
message DeviceProperty { message DeviceProperty {