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 SONY_ERICSSON to manufacturer list and try to be a bit more intelligent when detecting it.

Browse source
This commit is contained in:
Simo Kinnunen 2014-01-30 20:05:16 +09:00
parent f8cceffe91
commit aca775b7f7
2 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/util/devutil.js
View file

@ -155,26 +155,15 @@ devutil.platform = function(platform) {
} }
devutil.manufacturer = function(manufacturer) { devutil.manufacturer = function(manufacturer) {
switch (manufacturer.toUpperCase()) { var sanitized = manufacturer.toUpperCase().replace(/ /g, '_')
case 'SONY':
case 'SONY ERICSSON': if (wire.DeviceManufacturer[sanitized]) {
return wire.DeviceManufacturer.SONY return wire.DeviceManufacturer[sanitized]
case 'FUJITSU': }
return wire.DeviceManufacturer.FUJITSU
case 'HTC': switch (sanitized) {
return wire.DeviceManufacturer.HTC
case 'SHARP':
return wire.DeviceManufacturer.SHARP
case 'LGE': case 'LGE':
return wire.DeviceManufacturer.LG return wire.DeviceManufacturer.LG
case 'SAMSUNG':
return wire.DeviceManufacturer.SAMSUNG
case 'ASUS':
return wire.DeviceManufacturer.ASUS
case 'NEC':
return wire.DeviceManufacturer.NEC
case 'PANASONIC':
return wire.DeviceManufacturer.PANASONIC
default: default:
throw new Error(util.format('Unmapped manufacturer "%s"', manufacturer)) throw new Error(util.format('Unmapped manufacturer "%s"', manufacturer))
} }

39
lib/wire/wire.proto
View file

@ -74,25 +74,26 @@ enum DevicePlatform {
} }
enum DeviceManufacturer { enum DeviceManufacturer {
ACER = 1100; ACER = 1100;
APPLE = 1200; APPLE = 1200;
ASUS = 1300; ASUS = 1300;
CASIO = 1400; CASIO = 1400;
FUJITSU = 1500; FUJITSU = 1500;
HTC = 1600; HTC = 1600;
HUAWEI = 1700; HUAWEI = 1700;
KYOCERA = 1800; KYOCERA = 1800;
LG = 1900; LG = 1900;
MOTOROLA = 2000; MOTOROLA = 2000;
NEC = 2100; NEC = 2100;
PANASONIC = 2200; PANASONIC = 2200;
PANTECH = 2300; PANTECH = 2300;
RIM = 2400; RIM = 2400;
SAMSUNG = 2500; SAMSUNG = 2500;
SHARP = 2600; SHARP = 2600;
SONY = 2700; SONY = 2700;
TOSHIBA = 2800; SONY_ERICSSON = 2800;
ZTE = 2900; TOSHIBA = 2900;
ZTE = 3000;
} }
message DeviceDisplayMessage { message DeviceDisplayMessage {