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

Commit dbe6db05 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge changes Ic134f27e,I654620df,I0be8837f am: 84d5709e am: d7a78950 am:... 

Merge changes Ic134f27e,I654620df,I0be8837f am: 84d5709e am: d7a78950 am: ac4b8433 am: 3ccbef02 am: f3592f5b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2200205



Change-Id: I02ec22c53b66b61e1a9918c15f2ce7254d226d04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2733af64 f3592f5b

libs/binder/ndk/include_cpp/android/binder_parcel_utils.h

+0 −2
Original line number Diff line number Diff line
@@ -1639,7 +1639,6 @@ static inline binder_status_t AParcel_writeData(AParcel* parcel, const T& value) 
        return AParcel_writeParcelable(parcel, value);

    } else {

        static_assert(dependent_false_v<T>, "unrecognized type");

        return STATUS_OK;

    }

}
@@ -1707,7 +1706,6 @@ static inline binder_status_t AParcel_readData(const AParcel* parcel, T* value) 
        return AParcel_readParcelable(parcel, value);

    } else {

        static_assert(dependent_false_v<T>, "unrecognized type");

        return STATUS_OK;

    }

}

libs/binder/ndk/include_cpp/android/binder_to_string.h

+5 −0
Original line number Diff line number Diff line
@@ -162,7 +162,12 @@ std::string ToString(const _T& t) { 
    } else if constexpr (std::is_same_v<bool, _T>) {

        return t ? "true" : "false";

    } else if constexpr (std::is_same_v<char16_t, _T>) {

        // TODO(b/244494451): codecvt is deprecated in C++17 -- suppress the

        // warnings. There's no replacement in the standard library yet.

        _Pragma("clang diagnostic push")

                _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"");

        return std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>().to_bytes(t);

        _Pragma("clang diagnostic pop");

    } else if constexpr (std::is_arithmetic_v<_T>) {

        return std::to_string(t);

    } else if constexpr (std::is_same_v<std::string, _T>) {

services/surfaceflinger/Scheduler/VSyncReactor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define LOG_TAG "VSyncReactor"

//#define LOG_NDEBUG 0



#include <assert.h>

#include <cutils/properties.h>

#include <log/log.h>

#include <utils/Trace.h>