Merge "Fix sharesheet permissioned icon loading bug" (01f1178b) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverActivity.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -509,10 +509,11 @@ public class ResolverActivity extends Activity {
		@Nullable abstract String getAppSubLabelInternal();

		private Context mCtx;
		protected PackageManager mPm;
		private final ApplicationInfo mAi;
		private final int mIconDpi;
		private final boolean mHasSubstitutePermission;
		private final ApplicationInfo mAi;

		protected PackageManager mPm;

		TargetPresentationGetter(Context ctx, int iconDpi, ApplicationInfo ai) {
		mCtx = ctx;
		@@ -590,10 +591,10 @@ public class ResolverActivity extends Activity {
		* Loads the icon and label for the provided ResolveInfo.
		*/
		@VisibleForTesting
		public static class ResolveInfoPresentationGetter extends TargetPresentationGetter {
		public static class ResolveInfoPresentationGetter extends ActivityInfoPresentationGetter {
		private final ResolveInfo mRi;
		public ResolveInfoPresentationGetter(Context ctx, int iconDpi, ResolveInfo ri) {
		super(ctx, iconDpi, ri.activityInfo.applicationInfo);
		super(ctx, iconDpi, ri.activityInfo);
		mRi = ri;
		}

		@@ -611,6 +612,9 @@ public class ResolverActivity extends Activity {
		+ "couldn't find resources for package", e);
		}

		// Fall back to ActivityInfo if no icon is found via ResolveInfo
		if (dr == null) dr = super.getIconSubstituteInternal();

		return dr;
		}