am 2f4bfbf5: 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.
* commit '2f4bfbf51aa6044196f5a2e9767589aeb8324c51':
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 e2c1f66..4414617 100644
--- a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
@@ -151,7 +151,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));