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

Commit 0af44891 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "quickcontact: fallback to default secondary action drawable" into cm-11.0

parents cb871ad5 01665d05

src/com/android/contacts/quickcontact/DataAction.java

+7 −4
Original line number Diff line number Diff line
@@ -283,12 +283,15 @@ public class DataAction implements Action { 
        if (mAlternateIconRes == 0) return null;



        final String resourcePackageName = mKind.resourcePackageName;

        if (resourcePackageName == null) {

            return mContext.getResources().getDrawable(mAlternateIconRes);

        if (resourcePackageName != null) {

            final PackageManager pm = mContext.getPackageManager();

            Drawable dw = pm.getDrawable(resourcePackageName, mAlternateIconRes, null);

            if (dw != null) {

                return dw;

            }

        }



        final PackageManager pm = mContext.getPackageManager();

        return pm.getDrawable(resourcePackageName, mAlternateIconRes, null);

        return mContext.getResources().getDrawable(mAlternateIconRes);

    }



    @Override