commit 7158f893b1c71386265248c981d723554724dab4
author Daniel Xie <dxie@google.com> Mon Oct 19 23:21:59 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 19 23:21:59 2015 +0000
tree 09ba8b8232bc20d2933005ce1e7d7de7a4002717
parent feeded472d29f497cbafeb6f5da692fb4c5c5072
parent 518668280de01fc5d107111a2aeee632aa56569b

Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df
am: 518668280d

* commit '518668280de01fc5d107111a2aeee632aa56569b':
  Allow number of supported Bitmap to be greater than 4.

tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java

diff --git a/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java b/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
index 7fc5917..e097b5a 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
@@ -31,7 +31,7 @@
     public void testValues(){
         Config[] config = Config.values();
 
-        assertEquals(4, config.length);
+        assertTrue(config.length >= 4);
         assertEquals(Config.ALPHA_8, config[0]);
         assertEquals(Config.RGB_565, config[1]);
         assertEquals(Config.ARGB_4444, config[2]);