Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix sharing shortcuts not showing for Work Profile. Check package by using selected profile PackageManager." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-02 18:35:11 +00:00
committed by Android (Google) Code Review
parent 59fe064d75 469f9d3253
commit 1bbe3ab314
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2120,10 +2120,10 @@ public class ChooserActivity extends ResolverActivity implements
+ " resultList.size()=" + resultList.size() + " resultList.size()=" + resultList.size()
+ " appTargets.size()=" + appTargets.size()); + " appTargets.size()=" + appTargets.size());
} }
Context selectedProfileContext = createContextAsUser(userHandle, 0 /* flags */);
for (int i = resultList.size() - 1; i >= 0; i--) { for (int i = resultList.size() - 1; i >= 0; i--) {
final String packageName = resultList.get(i).getTargetComponent().getPackageName(); final String packageName = resultList.get(i).getTargetComponent().getPackageName();
if (!isPackageEnabled(packageName)) { if (!isPackageEnabled(selectedProfileContext, packageName)) {
resultList.remove(i); resultList.remove(i);
if (appTargets != null) { if (appTargets != null) {
appTargets.remove(i); appTargets.remove(i);
@@ -2175,13 +2175,13 @@ public class ChooserActivity extends ResolverActivity implements
mChooserHandler.sendMessage(msg); mChooserHandler.sendMessage(msg);
} }
private boolean isPackageEnabled(String packageName) { private boolean isPackageEnabled(Context context, String packageName) {
if (TextUtils.isEmpty(packageName)) { if (TextUtils.isEmpty(packageName)) {
return false; return false;
} }
ApplicationInfo appInfo; ApplicationInfo appInfo;
try { try {
appInfo = getPackageManager().getApplicationInfo(packageName, 0); appInfo = context.getPackageManager().getApplicationInfo(packageName, 0);
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
return false; return false;
} }