Merge "Use package context for loading task description icon resource" into pi-dev (0d685793) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/IconLoader.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.app.ActivityManager;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.pm.ActivityInfo;
		import android.content.pm.PackageManager;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.graphics.drawable.BitmapDrawable;
		@@ -106,11 +107,12 @@ public abstract class IconLoader {
		return createDrawableFromBitmap(tdIcon, userId, desc);
		}
		if (desc.getIconResource() != 0) {
		// TODO: Use task context here
		try {
		return createBadgedDrawable(
		mContext.getDrawable(desc.getIconResource()), userId, desc);
		} catch (Resources.NotFoundException e) {
		Context packageContext = mContext.createPackageContextAsUser(
		taskKey.getPackageName(), 0, UserHandle.of(userId));
		return createBadgedDrawable(packageContext.getDrawable(desc.getIconResource()),
		userId, desc);
		} catch (Resources.NotFoundException\|PackageManager.NameNotFoundException e) {
		Log.e(TAG, "Could not find icon drawable from resource", e);
		}
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,13 @@ public class Task {
		return this.baseIntent.getComponent();
		}

		public String getPackageName() {
		if (this.baseIntent.getComponent() != null) {
		return this.baseIntent.getComponent().getPackageName();
		}
		return this.baseIntent.getPackage();
		}

		@Override
		public boolean equals(Object o) {
		if (!(o instanceof TaskKey)) {