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

Commit 7f8b76a3 authored by Jaesoo Lee's avatar Jaesoo Lee Committed by Gerrit Code Review
Browse files

Merge "disabled passthrough mode for Configstore"

parents c3148416 2d66f618

configstore/1.0/default/Android.mk

+6 −24
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



################################################################################

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.configstore@1.0-impl

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_CLASS := SHARED_LIBRARIES

LOCAL_MODULE_RELATIVE_PATH := hw



include $(LOCAL_PATH)/surfaceflinger.mk



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libhidlbase \

    libhidltransport \

    libutils \

    android.hardware.configstore@1.0 \

    android.hidl.base@1.0



include $(BUILD_SHARED_LIBRARY)



################################################################################

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.configstore@1.0-service
@@ -28,13 +9,14 @@ LOCAL_MODULE_RELATIVE_PATH := hw 
LOCAL_INIT_RC := android.hardware.configstore@1.0-service.rc

LOCAL_SRC_FILES:= service.cpp



include $(LOCAL_PATH)/surfaceflinger.mk



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libdl \

    libutils \

    android.hardware.configstore@1.0 \

    libhidlbase \

    libhidltransport \

    android.hardware.configstore@1.0 \

    libbase \

    liblog \

    libutils \



include $(BUILD_EXECUTABLE)

configstore/1.0/default/service.cpp

+8 −7
Original line number Diff line number Diff line
@@ -17,13 +17,15 @@ 
#define LOG_TAG "android.hardware.configstore@1.0-service"



#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <hidl/LegacySupport.h>

#include <hidl/HidlTransportSupport.h>



#include "SurfaceFlingerConfigs.h"



using android::hardware::configstore::V1_0::ISurfaceFlingerConfigs;

using android::hardware::configureRpcThreadpool;

using android::hardware::registerPassthroughServiceImplementation;

using android::hardware::joinRpcThreadpool;



using android::hardware::configstore::V1_0::ISurfaceFlingerConfigs;

using android::hardware::configstore::V1_0::implementation::SurfaceFlingerConfigs;

using android::sp;

using android::status_t;

using android::OK;
@@ -31,9 +33,8 @@ int main() { 
    // TODO(b/34857894): tune the max thread count.

    configureRpcThreadpool(10, true);



    status_t status;



    status = registerPassthroughServiceImplementation<ISurfaceFlingerConfigs>();

    sp<ISurfaceFlingerConfigs> surfaceFlingerConfigs = new SurfaceFlingerConfigs;

    status_t status = surfaceFlingerConfigs->registerAsService();

    LOG_ALWAYS_FATAL_IF(status != OK, "Could not register ISurfaceFlingerConfigs");



    // other interface registration comes here