Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert IScreenCaptureListener to AIDL"

Browse Source
This commit is contained in:
Chavi Weingarten
2021-01-13 18:39:36 +00:00
committed by Android (Google) Code Review
parent f2a23c72aa 329fb64150
commit 4dbb48a487
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android_view_SurfaceControl.cpp
View File

@@ -26,11 +26,11 @@
#include <android-base/chrono_utils.h>
#include <android/graphics/region.h>
#include <android/gui/BnScreenCaptureListener.h>
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/android_hardware_HardwareBuffer.h>
#include <android_runtime/android_view_Surface.h>
#include <android_runtime/android_view_SurfaceSession.h>
#include <gui/IScreenCaptureListener.h>
#include <gui/ISurfaceComposer.h>
#include <gui/Surface.h>
#include <gui/SurfaceComposerClient.h>
@@ -51,8 +51,8 @@
#include <ui/HdrCapabilities.h>
#include <ui/Rect.h>
#include <ui/Region.h>
#include <utils/Log.h>
#include <utils/LightRefBase.h>
#include <utils/Log.h>
// ----------------------------------------------------------------------------
@@ -247,7 +247,7 @@ constexpr ui::Dataspace pickDataspaceFromColorMode(const ui::ColorMode colorMode
}
}
class ScreenCaptureListenerWrapper : public BnScreenCaptureListener {
class ScreenCaptureListenerWrapper : public gui::BnScreenCaptureListener {
public:
explicit ScreenCaptureListenerWrapper(JNIEnv* env, jobject jobject) {
env->GetJavaVM(&mVm);
@@ -262,12 +262,13 @@ public:
}
}
status_t onScreenCaptureComplete(const ScreenCaptureResults& captureResults) override {
binder::Status onScreenCaptureComplete(
const gui::ScreenCaptureResults& captureResults) override {
JNIEnv* env = getenv();
if (captureResults.result != NO_ERROR || captureResults.buffer == nullptr) {
env->CallVoidMethod(screenCaptureListenerObject,
gScreenCaptureListenerClassInfo.onScreenCaptureComplete, nullptr);
return NO_ERROR;
return binder::Status::ok();
}
jobject jhardwareBuffer = android_hardware_HardwareBuffer_createFromAHardwareBuffer(
env, captureResults.buffer->toAHardwareBuffer());
@@ -283,7 +284,7 @@ public:
screenshotHardwareBuffer);
env->DeleteLocalRef(jhardwareBuffer);
env->DeleteLocalRef(screenshotHardwareBuffer);
return NO_ERROR;
return binder::Status::ok();
}
private: