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

Commit bc982a4f authored by Tao Bao's avatar Tao Bao
Browse files

Remove ui_print(). 

This used to be a helper function that allows printing message to UI.
We no longer have any active user in bootable/recovery. Device-specific
code can achieve the same functionality by calling GetUI()->Print()
instead.

Test: mmma -j bootable/recovery
Change-Id: If584fc8a51d1af466f1d94d8ea5faa262603a784
parent a232d9dc

common.h

+1 −8
Original line number Diff line number Diff line
@@ -14,11 +14,7 @@ 
 * limitations under the License.

 */



#ifndef RECOVERY_COMMON_H

#define RECOVERY_COMMON_H



#include <stdarg.h>

#include <stdio.h>

#pragma once



#include <string>
@@ -39,9 +35,6 @@ extern std::string stage; 
// The reason argument provided in "--reason=".

extern const char* reason;



void ui_print(const char* format, ...) __printflike(1, 2);



bool is_ro_debuggable();



bool SetUsbConfig(const std::string& state);
 
#endif  // RECOVERY_COMMON_H

recovery.cpp

+0 −15
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <limits.h>

#include <linux/fs.h>

#include <linux/input.h>

#include <stdarg.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>
@@ -746,20 +745,6 @@ static void print_property(const char* key, const char* name, void* /* cookie */ 
  printf("%s=%s\n", key, name);

}



void ui_print(const char* format, ...) {

    std::string buffer;

    va_list ap;

    va_start(ap, format);

    android::base::StringAppendV(&buffer, format, ap);

    va_end(ap);



    if (ui != nullptr) {

        ui->Print("%s", buffer.c_str());

    } else {

        fputs(buffer.c_str(), stdout);

    }

}



static bool is_battery_ok(int* required_battery_level) {

  using android::hardware::health::V1_0::BatteryStatus;

  using android::hardware::health::V2_0::get_health_service;

recovery_ui/include/recovery_ui/device.h

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ class Device { 


  // Performs a recovery action selected from the menu. 'menu_position' will be the index of the

  // selected menu item, or a non-negative value returned from HandleMenuKey(). The menu will be

  // hidden when this is called; implementations can call ui_print() to print information to the

  // screen. If the menu position is one of the builtin actions, you can just return the

  // hidden when this is called; implementations can call GetUI()->Print() to print information to

  // the screen. If the menu position is one of the builtin actions, you can just return the

  // corresponding enum value. If it is an action specific to your device, you actually perform it

  // here and return NO_ACTION.

  virtual BuiltinAction InvokeMenuItem(size_t menu_position);