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

Commit 4a074656 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6077728 from 9da3efb7 to rvc-release 

Change-Id: Iea8f8f41def88d14731d789038aa04e934f4dc63
parents cd6a14bc 9da3efb7

system/gd/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -473,7 +473,8 @@ genrule { 
        "touch $(genDir)/hci/facade/__init__.py; " +

        "touch $(genDir)/hci/cert/__init__.py; " +

        "touch $(genDir)/l2cap/classic/__init__.py; " +

        "touch $(genDir)/l2cap/classic/cert/__init__.py; ",

        "touch $(genDir)/l2cap/classic/cert/__init__.py; " +

        "touch $(genDir)/security/__init__.py; ",

    srcs: [

        ":BluetoothFacadeProto",

        ":BluetoothCertStackProto",
@@ -504,6 +505,9 @@ genrule { 
        "l2cap/classic/cert/__init__.py",

        "l2cap/classic/cert/api_pb2_grpc.py",

        "l2cap/classic/cert/api_pb2.py",

        "security/__init__.py",

        "security/facade_pb2_grpc.py",

        "security/facade_pb2.py",

    ],

}

system/gd/cert/cert_testcases_facade_only

+2 −1
Original line number Diff line number Diff line 
SimpleHalTest

SimpleSecurityTest

system/gd/cert/run_cert_facade_only.sh

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

system/gd/facade/grpc_root_server.cc

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "l2cap/classic/facade.h"

#include "os/log.h"

#include "os/thread.h"

#include "security/facade.h"

#include "stack_manager.h"



namespace bluetooth {
@@ -62,6 +63,10 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
        modules.add<::bluetooth::facade::ReadOnlyPropertyServerModule>();

        modules.add<::bluetooth::l2cap::classic::L2capClassicModuleFacadeModule>();

        break;

      case BluetoothModule::SECURITY:

        modules.add<::bluetooth::facade::ReadOnlyPropertyServerModule>();

        modules.add<::bluetooth::security::SecurityModuleFacadeModule>();

        break;

      default:

        return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "invalid module under test");

    }

system/gd/l2cap/classic/fixed_channel_mock.h

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#pragma once



#include "l2cap/classic/fixed_channel.h"

#include "l2cap/classic/internal/fixed_channel_impl_mock.h"

#include "os/handler.h"



#include <gmock/gmock.h>



#include <utility>



// Unit test interfaces

namespace bluetooth {

namespace l2cap {

namespace classic {

namespace testing {



class MockFixedChannel : public FixedChannel {

 public:

  MockFixedChannel() : FixedChannel(nullptr, nullptr){};

  MOCK_METHOD(void, Acquire, ());

  MOCK_METHOD(void, Release, ());

  MOCK_METHOD(void, RegisterOnCloseCallback, (os::Handler * handler, OnCloseCallback on_close_callback));

};



}  // namespace testing

}  // namespace classic

}  // namespace l2cap

}  // namespace bluetooth