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

Commit 08d8df07 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bug fix for libmediautils_fuzzer_scheduling_policy_service" am:... 

Merge "Bug fix for libmediautils_fuzzer_scheduling_policy_service" am: 011dbb4b am: 0fb18f14 am: 0e5fc476 am: 8bb3706a am: 898e6cd3

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



Change-Id: Ie92462985f75084a3210b8cb366dcb1b9d61b212
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9755754 898e6cd3

media/utils/fuzzers/SchedulingPolicyServiceFuzz.cpp

+7 −2
Original line number Diff line number Diff line
@@ -34,11 +34,16 @@ sp<IBatteryStats> getBatteryService() { 
    const sp<IServiceManager> sm(defaultServiceManager());

    if (sm != nullptr) {

        const String16 name("batterystats");

        batteryStatService = checked_interface_cast<IBatteryStats>(sm->checkService(name));

        if (batteryStatService == nullptr) {

        sp<IBinder> obj = sm->checkService(name);

        if (!obj) {

            ALOGW("batterystats service unavailable!");

            return nullptr;

        }

        batteryStatService = checked_interface_cast<IBatteryStats>(obj);

        if (batteryStatService == nullptr) {

            ALOGW("batterystats service interface is invalid");

            return nullptr;

        }

    }

    return batteryStatService;

}