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

Commit b9671b76 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge changes from topic "healthd_test" am: 17ed9c4f am: 0074cc18 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392638

Change-Id: I19e59b376088e1a6b7637fb12b585cf9eccbb215
parents 6cf4ca0c 0074cc18

healthd/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -240,3 +240,20 @@ cc_test { 
    defaults: ["charger_defaults"],

    srcs: ["charger_test.cpp"],

}



cc_test {

    name: "libhealthd_charger_test",

    srcs: ["AnimationParser_test.cpp"],

    shared_libs: [

        "liblog",

        "libbase",

        "libcutils",

    ],

    static_libs: [

        "libhealthd_charger",

    ],

    test_suites: [

        "general-tests",

        "device-tests",

    ],

}

healthd/AnimationParser.cpp

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ bool can_ignore_line(const char* str) { 
    return true;

}



bool remove_prefix(const std::string& line, const char* prefix, const char** rest) {

    const char* str = line.c_str();

bool remove_prefix(std::string_view line, const char* prefix, const char** rest) {

    const char* str = line.data();

    int start;

    char c;

healthd/AnimationParser.h

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef HEALTHD_ANIMATION_PARSER_H

#define HEALTHD_ANIMATION_PARSER_H



#include <string_view>



#include "animation.h"



namespace android {
@@ -24,7 +26,7 @@ namespace android { 
bool parse_animation_desc(const std::string& content, animation* anim);



bool can_ignore_line(const char* str);

bool remove_prefix(const std::string& str, const char* prefix, const char** rest);

bool remove_prefix(std::string_view str, const char* prefix, const char** rest);

bool parse_text_field(const char* in, animation::text_field* field);

}  // namespace android

healthd/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "libhealthd_charger_test"

    }

  ]

}