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

Commit 35d1511b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix up result type for bit-wise or of enum values"

parents 1c3718b0 fbd34663

vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ bool mergeSubscribeOptions(const SubscribeOptions &oldOpts, 
    }



    float updatedRate = std::max(oldOpts.sampleRate, newOpts.sampleRate);

    SubscribeFlags updatedFlags = oldOpts.flags | newOpts.flags;

    SubscribeFlags updatedFlags = SubscribeFlags(oldOpts.flags | newOpts.flags);



    bool updated = updatedRate > oldOpts.sampleRate

                   || updatedAreas != oldOpts.vehicleAreas