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

Commit ee4804a7 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: move asString to android namespace" into nyc-dev

parents 7e258e85 7fa3efa6

include/media/stagefright/foundation/ADebug.h

+3 −4
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ 
#include <media/stagefright/foundation/AString.h>

#include <utils/Log.h>



inline static const char *asString(android::status_t i, const char *def = "??") {

    using namespace android;

namespace android {



inline static const char *asString(status_t i, const char *def = "??") {

    switch (i) {

        case NO_ERROR:              return "NO_ERROR";

        case UNKNOWN_ERROR:         return "UNKNOWN_ERROR";
@@ -49,8 +50,6 @@ inline static const char *asString(android::status_t i, const char *def = "??") 
    }

}



namespace android {



#define LITERAL_TO_STRING_INTERNAL(x)    #x

#define LITERAL_TO_STRING(x) LITERAL_TO_STRING_INTERNAL(x)