am 922fca93: Merge "Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well." into gingerbread
* commit '922fca939412e1090bf8f240b51057793c9c7bb6':
Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.
diff --git a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
index e72e4db..c306c79 100644
--- a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
@@ -150,7 +150,9 @@
private void validateOptions(Bundle expectedOptions, Bundle actualOptions) {
if (expectedOptions == null) {
- assertNull(actualOptions);
+ if (actualOptions != null) {
+ assertTrue(actualOptions.isEmpty());
+ }
} else {
assertNotNull(actualOptions);
assertEquals(expectedOptions.get(OPTION_NAME_1), actualOptions.get(OPTION_NAME_1));