Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17f83df9 authored by Conley Owens's avatar Conley Owens Committed by Android Git Automerger
Browse files

am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap... 

am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."

* commit '7dcdfd79':
  Eliminating dead logic - bitmap state simply cannot be null here.
parents 280a0c17 7dcdfd79

graphics/java/android/graphics/drawable/BitmapDrawable.java

+1 −3
Original line number Diff line number Diff line
@@ -546,10 +546,8 @@ public class BitmapDrawable extends Drawable { 
        mBitmapState = state;

        if (res != null) {

            mTargetDensity = res.getDisplayMetrics().densityDpi;

        } else if (state != null) {

            mTargetDensity = state.mTargetDensity;

        } else {

            mTargetDensity = DisplayMetrics.DENSITY_DEFAULT;

            mTargetDensity = state.mTargetDensity;

        }

        setBitmap(state != null ? state.mBitmap : null);

    }