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

Commit 3fe7cd59 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix 64-bit build issues" am: 5533d0cd am: 9c78c5c2 

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

Change-Id: Ie5ecba83d5c10ca600811468087850c374c46388
parents 7467de59 9c78c5c2

drm/drmserver/DrmManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -99,13 +99,13 @@ void DrmManager::onMessageReceived(const sp<AMessage> &msg) { 
        }

        default:

        {

            ALOGW("Unrecognized message type: %zd", msg->what());

            ALOGW("Unrecognized message type: %u", msg->what());

        }

    }

}



int64_t DrmManager::getMetricsFlushPeriodUs() {

    return 1000 * 1000 * std::max(1ll, property_get_int64("drmmanager.metrics.period", 86400));

    return 1000 * 1000 * std::max(1ll, (long long)property_get_int64("drmmanager.metrics.period", 86400));

}



void DrmManager::recordEngineMetrics(