jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug where the screenshot of some Android phones was unavailable (#4366)

Browse Source 
Summary:
The 'screenrecord' command is not in some Android phones e.g OPPO. So 'screenrecord' command can't be used as a basis for determining whether or not you can take a screenshot. Replace it with 'screencap' command  to determine whether you can take a screenshot.

## Changelog

Fixed a bug where the screenshot of some Android phones was unavailable

Pull Request resolved: https://github.com/facebook/flipper/pull/4366

Test Plan: It passed the test on my Mac and OPPO phone Reno2.

Reviewed By: ivanmisuno

Differential Revision: D42918902

Pulled By: passy

fbshipit-source-id: c1f02f075817d90e0d447f466a1168b6ec932e4e
This commit is contained in:
kongxiaojun
2023-02-02 08:17:33 -08:00
committed by Facebook GitHub Bot
parent 65f0a81fd1
commit e2867a74a7
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
desktop/flipper-server-core/src/devices/android/AndroidDevice.tsx
View File

@@ -167,6 +167,17 @@ export default class AndroidDevice
} }
} }
async screenShotAvailable(): Promise<boolean> {
try {
await this.executeShellOrDie(
`[ ! -f /system/bin/screencap ] && echo "File does not exist"`,
);
return true;
} catch (_e) {
return false;
}
}
async executeShell(command: string): Promise<string> { async executeShell(command: string): Promise<string> {
return await this.adb return await this.adb
.shell(this.serial, command) .shell(this.serial, command)

6
desktop/flipper-server-core/src/devices/android/androidDeviceManager.tsx
View File

@@ -100,12 +100,10 @@ export class AndroidDeviceManager {
// The default way of capturing screenshots through adb does not seem to work // The default way of capturing screenshots through adb does not seem to work
// There is a way of getting a screenshot through KaiOS dev tools though // There is a way of getting a screenshot through KaiOS dev tools though
if (androidLikeDevice instanceof AndroidDevice) { if (androidLikeDevice instanceof AndroidDevice) {
const screenRecordAvailable =
await androidLikeDevice.screenRecordAvailable();
androidLikeDevice.info.features.screenCaptureAvailable = androidLikeDevice.info.features.screenCaptureAvailable =
screenRecordAvailable; await androidLikeDevice.screenRecordAvailable();
androidLikeDevice.info.features.screenshotAvailable = androidLikeDevice.info.features.screenshotAvailable =
screenRecordAvailable; await androidLikeDevice.screenShotAvailable();
} }
resolve(androidLikeDevice); resolve(androidLikeDevice);