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

Commit 77384e89 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "Safetynet logging for b/204445255" into rvc-dev am: f7087348 am:... 

Merge "Safetynet logging for b/204445255" into rvc-dev am: f7087348 am: 4425c09e am: 9d5da200 am: 3b6f9c51 am: a55bca79

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/16406360

Change-Id: Ib1767c0aa5c2759590187e7477be3f0d37d361ff
parents 2f28c8a2 a55bca79

media/libmediametrics/include/media/MediaMetricsItem.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <variant>

#include <variant>





#include <binder/Parcel.h>

#include <binder/Parcel.h>

#include <log/log.h>

#include <utils/Errors.h>

#include <utils/Errors.h>

#include <utils/Timers.h> // nsecs_t

#include <utils/Timers.h> // nsecs_t
@@ -502,6 +503,7 @@ protected: 
        do {

        do {

            if (ptr >= bufferptrmax) {

            if (ptr >= bufferptrmax) {

                ALOGE("%s: buffer exceeded", __func__);

                ALOGE("%s: buffer exceeded", __func__);

                android_errorWriteLog(0x534e4554, "204445255");

                return BAD_VALUE;

                return BAD_VALUE;

            }

            }

        } while (*ptr++ != 0);

        } while (*ptr++ != 0);