commit 6c37277a2f95f2533e87e3e1b9d199216a5782f3
author John Reck <jreck@google.com> Thu Apr 17 20:06:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 17 20:06:09 2014 +0000
tree 43a94a3fd193dc6e0de3281c7247564fc8810808
parent c15d923056c2a4b6beaf65ed0bde6576cf0e2ead
parent 5b90fc53e11be7741ba7e9674f155cd9d68566df

am 5b90fc53: am 283b817c: am 1e088276: Fix testGetOpacity

* commit '5b90fc53e11be7741ba7e9674f155cd9d68566df':
  Fix testGetOpacity

tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java

diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
index c3217f1..4d1c4cf 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
@@ -252,6 +252,7 @@
         bitmapDrawable.setGravity(Gravity.BOTTOM);
         assertEquals(PixelFormat.TRANSLUCENT, bitmapDrawable.getOpacity());
 
+        source = mContext.getResources().openRawResource(R.raw.testimage);
         bitmapDrawable = new BitmapDrawable(source);
         assertEquals(Gravity.FILL, bitmapDrawable.getGravity());
         assertEquals(PixelFormat.OPAQUE, bitmapDrawable.getOpacity());