Merge "Add MATCH_UNINSTALLED_PACKAGES when obtaining activity info" into main (c6d271cb) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -738,7 +738,11 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
	return;		return;
	}		}
	final PackageManager pm = mContext.getApplicationContext().getPackageManager();		final PackageManager pm = mContext.getApplicationContext().getPackageManager();
	final ActivityInfo activityInfo = pm.getActivityInfo(baseActivity, 0 /* flags */);		final ActivityInfo activityInfo = pm.getActivityInfo(baseActivity,
			// Include uninstalled apps. Despite its name, adding this flag is a workaround
			// to #getActivityInfo throwing a NameNotFoundException for installed packages
			// when HSUM is enabled. See b/354884302.
			PackageManager.MATCH_UNINSTALLED_PACKAGES);
	final IconProvider provider = new IconProvider(mContext);		final IconProvider provider = new IconProvider(mContext);
	final Drawable appIconDrawable = provider.getIcon(activityInfo);		final Drawable appIconDrawable = provider.getIcon(activityInfo);
	final BaseIconFactory headerIconFactory = createIconFactory(mContext,		final BaseIconFactory headerIconFactory = createIconFactory(mContext,