commit b01e3652c15c1291cd3c4acf21b71f450d17467c
author Daniel Xie <dxie@google.com> Mon Oct 19 23:43:13 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 19 23:43:13 2015 +0000
tree 330f932d6d0b628cf96f57d71d37bfef52f0aae4
parent 791e51a5059826e3fb81dfa5b575bcae00a3d29c
parent f7c3e996b32a45e5a5264d634254b00f76ac9e0a

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

* commit 'f7c3e996b32a45e5a5264d634254b00f76ac9e0a':
  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]);