diff --git a/lib/units/device/plugins/screen.js b/lib/units/device/plugins/screen.js index 8564da82..23cfaf97 100644 --- a/lib/units/device/plugins/screen.js +++ b/lib/units/device/plugins/screen.js @@ -177,12 +177,7 @@ module.exports = syrup.serial() } try { - var info = JSON.parse(out) - // Compat for now, remove eventually - info.rotation = 0 - info.fps = 0 - info.secure = false - return info + return JSON.parse(out) } catch (e) { throw new Error(out.toString()) diff --git a/lib/units/device/plugins/service.js b/lib/units/device/plugins/service.js index 50d19305..e61442be 100644 --- a/lib/units/device/plugins/service.js +++ b/lib/units/device/plugins/service.js @@ -345,6 +345,10 @@ module.exports = syrup.serial() , density: response.density , rotation: response.rotation , secure: response.secure + , size: Math.sqrt( + Math.pow(response.width / response.xdpi, 2) + + Math.pow(response.height / response.ydpi, 2) + ) } } throw new Error('Unable to retrieve display information') diff --git a/vendor/minicap/bin/arm64-v8a/minicap b/vendor/minicap/bin/arm64-v8a/minicap index 1c2c4f39..d393e43f 100755 Binary files a/vendor/minicap/bin/arm64-v8a/minicap and b/vendor/minicap/bin/arm64-v8a/minicap differ diff --git a/vendor/minicap/bin/arm64-v8a/minicap-nopie b/vendor/minicap/bin/arm64-v8a/minicap-nopie index 1c2c4f39..d393e43f 100755 Binary files a/vendor/minicap/bin/arm64-v8a/minicap-nopie and b/vendor/minicap/bin/arm64-v8a/minicap-nopie differ diff --git a/vendor/minicap/bin/armeabi-v7a/minicap b/vendor/minicap/bin/armeabi-v7a/minicap index ba028dad..27374f35 100755 Binary files a/vendor/minicap/bin/armeabi-v7a/minicap and b/vendor/minicap/bin/armeabi-v7a/minicap differ diff --git a/vendor/minicap/bin/armeabi-v7a/minicap-nopie b/vendor/minicap/bin/armeabi-v7a/minicap-nopie index 2c2887c4..a58e1b72 100755 Binary files a/vendor/minicap/bin/armeabi-v7a/minicap-nopie and b/vendor/minicap/bin/armeabi-v7a/minicap-nopie differ diff --git a/vendor/minicap/bin/x86/minicap b/vendor/minicap/bin/x86/minicap index 5b9b423e..dd794d45 100755 Binary files a/vendor/minicap/bin/x86/minicap and b/vendor/minicap/bin/x86/minicap differ diff --git a/vendor/minicap/bin/x86/minicap-nopie b/vendor/minicap/bin/x86/minicap-nopie index 435d0671..66e9870c 100755 Binary files a/vendor/minicap/bin/x86/minicap-nopie and b/vendor/minicap/bin/x86/minicap-nopie differ diff --git a/vendor/minicap/shared/android-10/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-10/armeabi-v7a/minicap.so index 92cc63a0..c0360367 100755 Binary files a/vendor/minicap/shared/android-10/armeabi-v7a/minicap.so and b/vendor/minicap/shared/android-10/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-14/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-14/armeabi-v7a/minicap.so index 349ee181..6eb377ce 100755 Binary files a/vendor/minicap/shared/android-14/armeabi-v7a/minicap.so and b/vendor/minicap/shared/android-14/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-14/x86/minicap.so b/vendor/minicap/shared/android-14/x86/minicap.so index 499457a9..5f2ad2fd 100755 Binary files a/vendor/minicap/shared/android-14/x86/minicap.so and b/vendor/minicap/shared/android-14/x86/minicap.so differ diff --git a/vendor/minicap/shared/android-15/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-15/armeabi-v7a/minicap.so index d59caa6e..3ba71dab 100755 Binary files a/vendor/minicap/shared/android-15/armeabi-v7a/minicap.so and b/vendor/minicap/shared/android-15/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-15/x86/minicap.so b/vendor/minicap/shared/android-15/x86/minicap.so index 19abd841..1aa48a21 100755 Binary files a/vendor/minicap/shared/android-15/x86/minicap.so and b/vendor/minicap/shared/android-15/x86/minicap.so differ diff --git a/vendor/minicap/shared/android-16/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-16/armeabi-v7a/minicap.so index 827251d1..3c8ea4f5 100755 Binary files a/vendor/minicap/shared/android-16/armeabi-v7a/minicap.so and b/vendor/minicap/shared/android-16/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-16/x86/minicap.so b/vendor/minicap/shared/android-16/x86/minicap.so index 12cfbb81..053fb428 100755 Binary files a/vendor/minicap/shared/android-16/x86/minicap.so and b/vendor/minicap/shared/android-16/x86/minicap.so differ diff --git a/vendor/minicap/shared/android-17/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-17/armeabi-v7a/minicap.so index 0534d1ce..c5ce2cde 100755 Binary files a/vendor/minicap/shared/android-17/armeabi-v7a/minicap.so and b/vendor/minicap/shared/android-17/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-17/x86/minicap.so b/vendor/minicap/shared/android-17/x86/minicap.so index 1d57779a..2b7402b3 100755 Binary files a/vendor/minicap/shared/android-17/x86/minicap.so and b/vendor/minicap/shared/android-17/x86/minicap.so differ diff --git a/vendor/minicap/shared/android-18/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-18/armeabi-v7a/minicap.so index 45de41e6..39a4c13b 100755 Binary files a/vendor/minicap/shared/android-18/armeabi-v7a/minicap.so and b/vendor/minicap/shared/android-18/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-18/x86/minicap.so b/vendor/minicap/shared/android-18/x86/minicap.so index 0e1d7166..04276346 100755 Binary files a/vendor/minicap/shared/android-18/x86/minicap.so and b/vendor/minicap/shared/android-18/x86/minicap.so differ diff --git a/vendor/minicap/shared/android-19/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-19/armeabi-v7a/minicap.so index 5cdf9771..ff473772 100755 Binary files a/vendor/minicap/shared/android-19/armeabi-v7a/minicap.so and b/vendor/minicap/shared/android-19/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-19/x86/minicap.so b/vendor/minicap/shared/android-19/x86/minicap.so index 8e69f98c..7fec4ac0 100755 Binary files a/vendor/minicap/shared/android-19/x86/minicap.so and b/vendor/minicap/shared/android-19/x86/minicap.so differ diff --git a/vendor/minicap/shared/android-21/arm64-v8a/minicap.so b/vendor/minicap/shared/android-21/arm64-v8a/minicap.so index f713ec68..1021c913 100755 Binary files a/vendor/minicap/shared/android-21/arm64-v8a/minicap.so and b/vendor/minicap/shared/android-21/arm64-v8a/minicap.so differ diff --git a/vendor/minicap/shared/android-21/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-21/armeabi-v7a/minicap.so index cf633d93..e80bfb91 100755 Binary files a/vendor/minicap/shared/android-21/armeabi-v7a/minicap.so and b/vendor/minicap/shared/android-21/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-21/x86/minicap.so b/vendor/minicap/shared/android-21/x86/minicap.so index 0f8d40b5..6b5afbe1 100755 Binary files a/vendor/minicap/shared/android-21/x86/minicap.so and b/vendor/minicap/shared/android-21/x86/minicap.so differ diff --git a/vendor/minicap/shared/android-21/x86_64/minicap.so b/vendor/minicap/shared/android-21/x86_64/minicap.so index 0d45775b..39848dc8 100755 Binary files a/vendor/minicap/shared/android-21/x86_64/minicap.so and b/vendor/minicap/shared/android-21/x86_64/minicap.so differ