Merge "Remove finalized concept from media.metrics" (31067d4b) · Commits · e / devices / smdk4412 / android_frameworks_av

drm/libmediadrm/PluginMetricsReporting.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ status_t reportMetricsGroup(const MetricsGroup& metricsGroup,
		}
		}

		analyticsItem.setFinalized(true);
		if (!analyticsItem.selfrecord()) {
		ALOGE("selfrecord() returned false. sessioId %" PRId64, sessionId);
		}

media/libaudioclient/include/media/AudioRecord.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -703,7 +703,6 @@ private:
		// mAnalyticsItem alloc failure will be flagged in the constructor
		// don't log empty records
		if (mAnalyticsItem->count() > 0) {
		mAnalyticsItem->setFinalized(true);
		mAnalyticsItem->selfrecord();
		}
		}

media/libaudioclient/include/media/AudioTrack.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -1198,7 +1198,6 @@ private:
		// mAnalyticsItem alloc failure will be flagged in the constructor
		// don't log empty records
		if (mAnalyticsItem->count() > 0) {
		mAnalyticsItem->setFinalized(true);
		mAnalyticsItem->selfrecord();
		}
		}

media/libmedia/nuplayer2/NuPlayer2Driver.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -129,7 +129,6 @@ NuPlayer2Driver::NuPlayer2Driver(pid_t pid)

		// set up an analytics record
		mAnalyticsItem = new MediaAnalyticsItem(kKeyPlayer);
		mAnalyticsItem->generateSessionID();

		mNuPlayer2Looper->start(
		false, /* runOnCallingThread */
		@@ -661,14 +660,12 @@ void NuPlayer2Driver::logMetrics(const char *where) {
		// So the canonical "empty" record has 3 elements in it.
		if (mAnalyticsItem->count() > 3) {

		mAnalyticsItem->setFinalized(true);
		mAnalyticsItem->selfrecord();

		// re-init in case we prepare() and start() again.
		delete mAnalyticsItem ;
		mAnalyticsItem = new MediaAnalyticsItem(kKeyPlayer);
		if (mAnalyticsItem) {
		mAnalyticsItem->generateSessionID();
		mAnalyticsItem->setUid(mClientUid);
		}
		} else {

media/libmediametrics/MediaAnalyticsItem.cpp

+5 −15

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ MediaAnalyticsItem::MediaAnalyticsItem()
		mPkgVersionCode(0),
		mSessionID(MediaAnalyticsItem::SessionIDNone),
		mTimestamp(0),
		mFinalized(0),
		mFinalized(1),
		mPropCount(0), mPropSize(0), mProps(NULL)
		{
		mKey = MediaAnalyticsItem::kKeyNone;
		@@ -72,7 +72,7 @@ MediaAnalyticsItem::MediaAnalyticsItem(MediaAnalyticsItem::Key key)
		mPkgVersionCode(0),
		mSessionID(MediaAnalyticsItem::SessionIDNone),
		mTimestamp(0),
		mFinalized(0),
		mFinalized(1),
		mPropCount(0), mPropSize(0), mProps(NULL)
		{
		if (DEBUG_ALLOCATIONS) {
		@@ -137,16 +137,6 @@ MediaAnalyticsItem *MediaAnalyticsItem::dup() {
		return dst;
		}

		// so clients can send intermediate values to be overlaid later
		MediaAnalyticsItem &MediaAnalyticsItem::setFinalized(bool value) {
		mFinalized = value;
		return *this;
		}

		bool MediaAnalyticsItem::getFinalized() const {
		return mFinalized;
		}

		MediaAnalyticsItem &MediaAnalyticsItem::setSessionID(MediaAnalyticsItem::SessionID_t id) {
		mSessionID = id;
		return *this;
		@@ -636,7 +626,10 @@ int32_t MediaAnalyticsItem::readFromParcel(const Parcel& data) {
		mPkgName = data.readCString();
		mPkgVersionCode = data.readInt64();
		mSessionID = data.readInt64();
		// We no longer pay attention to user setting of finalized, BUT it's
		// still part of the wire packet -- so read & discard.
		mFinalized = data.readInt32();
		mFinalized = 1;
		mTimestamp = data.readInt64();

		int count = data.readInt32();
		@@ -978,9 +971,6 @@ bool MediaAnalyticsItem::merge(MediaAnalyticsItem *incoming) {
		mSessionID = incoming->mSessionID;
		}

		// we always take the more recent 'finalized' value
		setFinalized(incoming->getFinalized());

		// for each attribute from 'incoming', resolve appropriately
		int nattr = incoming->mPropCount;
		for (int i = 0 ; i < nattr; i++ ) {