Skip to content

Commit d71df10

Browse files
arter97varund7726
authored andcommitted
JAudioTrack: fix bitwise evaluation
These must be & in order for proper evaluations Change-Id: I709a422a93b28c7e0e33e75c7af942839416c194 Signed-off-by: Park Ju Hyung <[email protected]> Signed-off-by: Varun Date <[email protected]>
1 parent 46dac4b commit d71df10

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

media/libmediaplayer2/JAudioTrack.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -691,30 +691,30 @@ jobject JAudioTrack::createVolumeShaperOperationObj(
691691
if (operation->getReplaceId() >= 0) {
692692
jmethodID jReplace = env->GetMethodID(jBuilderCls, "replace",
693693
"(IB)Landroid/media/VolumeShaper$Operation$Builder;");
694-
bool join = (flags | media::VolumeShaper::Operation::FLAG_JOIN) != 0;
694+
bool join = (flags & media::VolumeShaper::Operation::FLAG_JOIN) != 0;
695695
jBuilderObj = env->CallObjectMethod(jBuilderCls, jReplace, operation->getReplaceId(), join);
696696
}
697697

698-
if (flags | media::VolumeShaper::Operation::FLAG_REVERSE) {
698+
if (flags & media::VolumeShaper::Operation::FLAG_REVERSE) {
699699
jmethodID jReverse = env->GetMethodID(jBuilderCls, "reverse",
700700
"()Landroid/media/VolumeShaper$Operation$Builder;");
701701
jBuilderObj = env->CallObjectMethod(jBuilderCls, jReverse);
702702
}
703703

704704
// TODO: VolumeShaper Javadoc says "Do not call terminate() directly". Can we call this?
705-
if (flags | media::VolumeShaper::Operation::FLAG_TERMINATE) {
705+
if (flags & media::VolumeShaper::Operation::FLAG_TERMINATE) {
706706
jmethodID jTerminate = env->GetMethodID(jBuilderCls, "terminate",
707707
"()Landroid/media/VolumeShaper$Operation$Builder;");
708708
jBuilderObj = env->CallObjectMethod(jBuilderCls, jTerminate);
709709
}
710710

711-
if (flags | media::VolumeShaper::Operation::FLAG_DELAY) {
711+
if (flags & media::VolumeShaper::Operation::FLAG_DELAY) {
712712
jmethodID jDefer = env->GetMethodID(jBuilderCls, "defer",
713713
"()Landroid/media/VolumeShaper$Operation$Builder;");
714714
jBuilderObj = env->CallObjectMethod(jBuilderCls, jDefer);
715715
}
716716

717-
if (flags | media::VolumeShaper::Operation::FLAG_CREATE_IF_NECESSARY) {
717+
if (flags & media::VolumeShaper::Operation::FLAG_CREATE_IF_NECESSARY) {
718718
jmethodID jCreateIfNeeded = env->GetMethodID(jBuilderCls, "createIfNeeded",
719719
"()Landroid/media/VolumeShaper$Operation$Builder;");
720720
jBuilderObj = env->CallObjectMethod(jBuilderCls, jCreateIfNeeded);

0 commit comments

Comments
 (0)