From 749abfeff2d4fa926d55a68f60c6ba0428d83695 Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Thu, 7 Jul 2022 07:50:14 -0700 Subject: [PATCH] Expose device description in device interface Summary: This is needed to avoid mobile builds depending on BaseDevice Reviewed By: mweststrate Differential Revision: D37315909 fbshipit-source-id: a090bd3e76ceefe1f2ac68f832ee544ae45a8d6a --- desktop/flipper-plugin/src/plugin/DevicePlugin.tsx | 2 ++ desktop/flipper-plugin/src/test-utils/test-utils.tsx | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/desktop/flipper-plugin/src/plugin/DevicePlugin.tsx b/desktop/flipper-plugin/src/plugin/DevicePlugin.tsx index 0e1b03f0d..1b0bd1616 100644 --- a/desktop/flipper-plugin/src/plugin/DevicePlugin.tsx +++ b/desktop/flipper-plugin/src/plugin/DevicePlugin.tsx @@ -19,6 +19,7 @@ import { ServerAddOnControls, EventsContract, MethodsContract, + DeviceDescription, } from 'flipper-common'; export type DeviceLogListener = (entry: DeviceLogEntry) => void; @@ -26,6 +27,7 @@ export type CrashLogListener = (crash: CrashLog) => void; export interface Device { readonly isArchived: boolean; + readonly description: DeviceDescription; readonly isConnected: boolean; readonly os: DeviceOS; readonly serial: string; diff --git a/desktop/flipper-plugin/src/test-utils/test-utils.tsx b/desktop/flipper-plugin/src/test-utils/test-utils.tsx index 327c2dc7b..e943e6175 100644 --- a/desktop/flipper-plugin/src/test-utils/test-utils.tsx +++ b/desktop/flipper-plugin/src/test-utils/test-utils.tsx @@ -575,6 +575,16 @@ function createMockDevice(options?: StartPluginOptions): Device & { const crashListeners: (undefined | CrashLogListener)[] = []; return { os: 'Android', + description: { + os: 'Android', + deviceType: 'emulator', + features: { + screenCaptureAvailable: false, + screenshotAvailable: false, + }, + serial: '123', + title: 'Test device', + }, deviceType: 'emulator', serial: 'serial-000', isArchived: !!options?.isArchived,