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

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

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

* commit '501f7bca':
  Eliminating dead logic - bitmap state simply cannot be null here.
parents eef8f148 501f7bca

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

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

        mBitmapState = state;

        if (res != null) {

        if (res != null) {

            mTargetDensity = res.getDisplayMetrics().densityDpi;

            mTargetDensity = res.getDisplayMetrics().densityDpi;

        } else if (state != null) {

            mTargetDensity = state.mTargetDensity;

        } else {

        } else {

            mTargetDensity = DisplayMetrics.DENSITY_DEFAULT;

            mTargetDensity = state.mTargetDensity;

        }

        }

        setBitmap(state.mBitmap);

        setBitmap(state.mBitmap);

    }

    }