summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/src/android/graphics
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-11-10 23:59:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-10 23:59:45 +0000
commit0ca185adaf095e88a721d89a7b5a439b45be24bf (patch)
treea5ca9950921f59f250395610654a715989a9fc7a /tools/layoutlib/bridge/src/android/graphics
parentfa6aa121cd0700a030971855af10d9425532c7f9 (diff)
parent9713d740182f37f15849997979384fde00a1f9c1 (diff)
downloadframeworks_base-0ca185adaf095e88a721d89a7b5a439b45be24bf.zip
frameworks_base-0ca185adaf095e88a721d89a7b5a439b45be24bf.tar.gz
frameworks_base-0ca185adaf095e88a721d89a7b5a439b45be24bf.tar.bz2
am 9713d740: am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 automerge: aa53920
* commit '9713d740182f37f15849997979384fde00a1f9c1': Remove needlessly thrown IOException.
Diffstat (limited to 'tools/layoutlib/bridge/src/android/graphics')
-rw-r--r--tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
index f4282ad..8d24d38 100644
--- a/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
@@ -141,7 +141,6 @@ public final class Bitmap_Delegate {
* Creates and returns a {@link Bitmap} initialized with the given stream content.
*
* @param input the stream from which to read the bitmap content
- * @param createFlags
* @param density the density associated with the bitmap
*
* @see Bitmap#isPremultiplied()
@@ -166,8 +165,7 @@ public final class Bitmap_Delegate {
* @see Bitmap#isMutable()
* @see Bitmap#getDensity()
*/
- public static Bitmap createBitmap(BufferedImage image, boolean isMutable,
- Density density) throws IOException {
+ public static Bitmap createBitmap(BufferedImage image, boolean isMutable, Density density) {
return createBitmap(image, getPremultipliedBitmapCreateFlags(isMutable), density);
}
@@ -175,7 +173,6 @@ public final class Bitmap_Delegate {
* Creates and returns a {@link Bitmap} initialized with the given {@link BufferedImage}
*
* @param image the bitmap content
- * @param createFlags
* @param density the density associated with the bitmap
*
* @see Bitmap#isPremultiplied()
@@ -183,7 +180,7 @@ public final class Bitmap_Delegate {
* @see Bitmap#getDensity()
*/
public static Bitmap createBitmap(BufferedImage image, Set<BitmapCreateFlags> createFlags,
- Density density) throws IOException {
+ Density density) {
// create a delegate with the given image.
Bitmap_Delegate delegate = new Bitmap_Delegate(image, Config.ARGB_8888);