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

Commit 0feaf90f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Expose EthernetDevice to custom UIs"

parents 7bc92050 f7b54717

recovery_ui/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ cc_library { 


    srcs: [

        "device.cpp",

        "ethernet_device.cpp",

        "ethernet_ui.cpp",

        "screen_ui.cpp",

        "stub_ui.cpp",
@@ -102,7 +103,7 @@ cc_library_static { 
    ],



    srcs: [

        "ethernet_device.cpp",

        "default_ethernet_device.cpp",

    ],



    shared_libs: [

recovery_ui/default_ethernet_device.cpp

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

 * Copyright (C) 2020 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.

 */



#include "recovery_ui/device.h"

#include "recovery_ui/ethernet_device.h"

#include "recovery_ui/ethernet_ui.h"



Device* make_device() {

  return new EthernetDevice(new EthernetRecoveryUI);

}

recovery_ui/ethernet_device.cpp

+1 −20
Original line number Diff line number Diff line
@@ -27,23 +27,9 @@ 
#include <sys/types.h>



#include "recovery_ui/device.h"

#include "recovery_ui/ethernet_device.h"

#include "recovery_ui/ethernet_ui.h"



class EthernetDevice : public Device {

 public:

  explicit EthernetDevice(EthernetRecoveryUI* ui);



  void PreRecovery() override;

  void PreFastboot() override;



 private:

  int SetInterfaceFlags(const unsigned set, const unsigned clr);

  void SetTitleIPv6LinkLocalAddress(const bool interface_up);



  android::base::unique_fd ctl_sock_;

  static const std::string interface;

};



const std::string EthernetDevice::interface = "eth0";



EthernetDevice::EthernetDevice(EthernetRecoveryUI* ui)
@@ -129,8 +115,3 @@ void EthernetDevice::SetTitleIPv6LinkLocalAddress(const bool interface_up) { 


  recovery_ui->SetIPv6LinkLocalAddress();

}
 


// -----------------------------------------------------------------------------------------

Device* make_device() {

  return new EthernetDevice(new EthernetRecoveryUI);

}

recovery_ui/include/recovery_ui/ethernet_device.h

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

 * Copyright (C) 2020 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.

 */



#ifndef _ETHERNET_RECOVERY_DEVICE_H

#define _ETHERNET_RECOVERY_DEVICE_H



#include "device.h"



#include <android-base/unique_fd.h>



// Forward declaration to avoid including "ethernet_ui.h".

class EthernetRecoveryUI;



class EthernetDevice : public Device {

 public:

  explicit EthernetDevice(EthernetRecoveryUI* ui);



  void PreRecovery() override;

  void PreFastboot() override;



 private:

  int SetInterfaceFlags(const unsigned set, const unsigned clr);

  void SetTitleIPv6LinkLocalAddress(const bool interface_up);



  android::base::unique_fd ctl_sock_;

  static const std::string interface;

};



#endif  // _ETHERNET_RECOVERY_DEVICE_H