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

Commit 03ffc41d authored by Sorin Basca's avatar Sorin Basca Committed by Automerger Merge Worker
Browse files

Merge "Make calls to yield() explicit" am: d01036ee am: 77567b04 am: 1d5a844b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2255343



Change-Id: I7ff323310c5b7716dfd79856d201bd3fb2ec9293
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4aef981 1d5a844b

media/tests/EffectsTest/src/com/android/effectstest/BassBoostTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -304,13 +304,13 @@ public class BassBoostTest extends Activity implements OnCheckedChangeListener { 
                for (int j = 0; j < NUM_EFFECTS; j++) {

                for (int j = 0; j < NUM_EFFECTS; j++) {

                    effects[j] = new BassBoost(0, mSession);

                    effects[j] = new BassBoost(0, mSession);

                    effects[j].setControlStatusListener(mEffectListener);

                    effects[j].setControlStatusListener(mEffectListener);

                    yield();

                    this.yield();

                }

                }

                for (int j = NUM_EFFECTS - 1; j >= 0; j--) {

                for (int j = NUM_EFFECTS - 1; j >= 0; j--) {

                    Log.w(TAG, "HammerReleaseTest releasing effect " + (Object) effects[j]);

                    Log.w(TAG, "HammerReleaseTest releasing effect " + (Object) effects[j]);

                    effects[j].release();

                    effects[j].release();

                    effects[j] = null;

                    effects[j] = null;

                    yield();

                    this.yield();

                }

                }

            }

            }

            Log.w(TAG, "HammerReleaseTest ended");

            Log.w(TAG, "HammerReleaseTest ended");

media/tests/EffectsTest/src/com/android/effectstest/VisualizerTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -251,13 +251,13 @@ public class VisualizerTest extends Activity implements OnCheckedChangeListener 
            for (int i = 0; i < NUM_ITERATIONS; i++) {

            for (int i = 0; i < NUM_ITERATIONS; i++) {

                for (int j = 0; j < NUM_EFFECTS; j++) {

                for (int j = 0; j < NUM_EFFECTS; j++) {

                    effects[j] = new Visualizer(mSession);

                    effects[j] = new Visualizer(mSession);

                    yield();

                    this.yield();

                }

                }

                for (int j = NUM_EFFECTS - 1; j >= 0; j--) {

                for (int j = NUM_EFFECTS - 1; j >= 0; j--) {

                    Log.w(TAG, "HammerReleaseTest releasing effect " + (Object) effects[j]);

                    Log.w(TAG, "HammerReleaseTest releasing effect " + (Object) effects[j]);

                    effects[j].release();

                    effects[j].release();

                    effects[j] = null;

                    effects[j] = null;

                    yield();

                    this.yield();

                }

                }

            }

            }

            Log.w(TAG, "HammerReleaseTest ended");

            Log.w(TAG, "HammerReleaseTest ended");