mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-18 06:53:20 +02:00
stf: Device name related updates (#516)
* stf: Upstream android-device-list library to cover newer devices * 1.2.1 version is nearly 2.5 years old so it does not cover latest android devices thus creates un-friendly device names, fixes it * no breaking API/ABI changes * to the latest 1.2.7 version https://github.com/pbakondy/android-device-list/blob/master/package.json#L3 Signed-off-by: sirmordred <oguzhan97yigit@gmail.com> * stf: Allow users to override device names * it allows to users to change device names by setting ro.stf.product.device attribute via: e.g adb shell setprop ro.stf.product.device Samsung Galaxy S9 * Not all time android-device-list library is updated, even if it is updated, it does not cover all devices * Users must have a way to override device name so they can change it as they want (alternative is: overriding ro.product.device attribute but changing that attribute may cause some unexpected system errors because it is used by android os in device as well) * Preserve current behavior: if stf could not find ro.stf.product.device attribute, it falls to base implementation Signed-off-by: sirmordred <oguzhan97yigit@gmail.com> * stf: Changed prefix of custom device name property * some properties starts with prefixes like "ro" are not allowed to change in some phones, use "debug" instead for more info: https://stackoverflow.com/questions/66877858/android-setprop-failed-to-set-property Signed-off-by: sirmordred <oguzhan97yigit@gmail.com> Co-authored-by: Karol Wrótniak <karol.wrotniak@droidsonroids.pl>
This commit is contained in:
@@ -137,6 +137,7 @@ devutil.makeIdentity = function(serial, properties) {
|
||||
var cpuPlatform = properties['ro.board.platform']
|
||||
var openGLESVersion = properties['ro.opengles.version']
|
||||
var marketName = properties['ro.product.device']
|
||||
var customMarketName = properties['debug.stf.product.device']
|
||||
|
||||
openGLESVersion = parseInt(openGLESVersion, 10)
|
||||
if (isNaN(openGLESVersion)) {
|
||||
@@ -159,7 +160,10 @@ devutil.makeIdentity = function(serial, properties) {
|
||||
model = model.substr(manufacturer.length)
|
||||
}
|
||||
|
||||
if (marketName) {
|
||||
if (customMarketName) {
|
||||
marketName = customMarketName
|
||||
}
|
||||
else if (marketName) {
|
||||
var devices = androidDeviceList.getDevicesByDeviceId(marketName)
|
||||
if (devices.length > 0) {
|
||||
marketName = devices[0].name
|
||||
|
||||
Reference in New Issue
Block a user