diff options
| author | Eric Rowe <erowe@google.com> | 2010-12-08 11:11:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-08 11:11:48 -0800 |
| commit | f9dee3b1d314365cb2bb5c6574d287d6a7c3d241 (patch) | |
| tree | 3db710b81f08fa5fe1bdd83adb23e2b745f0701c | |
| parent | 7b2029be0b77702e51fff367a2bf4f7fcb5d2456 (diff) | |
| parent | 5d0ed7b952667a1506585683c9eb5fe5ed7f0af2 (diff) | |
| download | frameworks_base-f9dee3b1d314365cb2bb5c6574d287d6a7c3d241.zip frameworks_base-f9dee3b1d314365cb2bb5c6574d287d6a7c3d241.tar.gz frameworks_base-f9dee3b1d314365cb2bb5c6574d287d6a7c3d241.tar.bz2 | |
Merge "Allow extra flags to be fired in BT stress tests"
| -rw-r--r-- | core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java b/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java index 29dee34..6da38a7 100644 --- a/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java +++ b/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java @@ -113,7 +113,7 @@ public class BluetoothTestUtils extends Assert { protected void setFiredFlag(int flag) { synchronized (this) { mFiredFlags |= flag; - if (mFiredFlags == mExpectedFlags) { + if ((mFiredFlags & mExpectedFlags) == mExpectedFlags) { mCompletedTime = System.currentTimeMillis(); } } |