Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 388571e5 authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Automerger Merge Worker
Browse files

Merge "core: Use ftl::Flags" into tm-dev am: 8142d153 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17365091



Change-Id: I64fa0e59b96843d76d62ac815cad963512d094e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d37481c 8142d153

core/jni/android_hardware_input_InputWindowHandle.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <android_runtime/AndroidRuntime.h>

#include <android_runtime/Log.h>

#include <binder/IPCThreadState.h>

#include <ftl/cast.h>

#include <ftl/flags.h>

#include <gui/SurfaceControl.h>

#include <gui/WindowInfo.h>

#include <nativehelper/JNIHelp.h>
@@ -151,7 +151,7 @@ bool NativeInputWindowHandle::updateInfo() { 
        env->DeleteLocalRef(regionObj);

    }



    const auto flags = Flags<WindowInfo::Flag>(

    const auto flags = ftl::Flags<WindowInfo::Flag>(

            env->GetIntField(obj, gInputWindowHandleClassInfo.layoutParamsFlags));

    const auto type = static_cast<WindowInfo::Type>(

            env->GetIntField(obj, gInputWindowHandleClassInfo.layoutParamsType));