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

Merge "Fixes query logic when not instant" into rvc-dev

Browse Source
This commit is contained in:
Patrick Baumann
2020-03-20 04:26:56 +00:00
committed by Android (Google) Code Review
parent 658dd8047d b08116e961
commit f114613079
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -7238,8 +7238,8 @@ public class PackageManagerService extends IPackageManager.Stub
resolveInfos.set(i, installerInfo); resolveInfos.set(i, installerInfo);
continue; continue;
} }
// caller is a full app
if (ephemeralPkgName == null) { if (ephemeralPkgName == null) {
// caller is a full app
SettingBase callingSetting = SettingBase callingSetting =
mSettings.getSettingLPr(UserHandle.getAppId(filterCallingUid)); mSettings.getSettingLPr(UserHandle.getAppId(filterCallingUid));
PackageSetting resolvedSetting = PackageSetting resolvedSetting =
@@ -7259,11 +7259,9 @@ public class PackageManagerService extends IPackageManager.Stub
&& intent.getComponent() == null) { && intent.getComponent() == null) {
// ephemeral apps can launch other ephemeral apps indirectly // ephemeral apps can launch other ephemeral apps indirectly
continue; continue;
} } else if (((info.activityInfo.flags & ActivityInfo.FLAG_VISIBLE_TO_INSTANT_APP) != 0)
&& !info.activityInfo.applicationInfo.isInstantApp()) {
// allow activities that have been explicitly exposed to ephemeral apps // allow activities that have been explicitly exposed to ephemeral apps
final boolean isEphemeralApp = info.activityInfo.applicationInfo.isInstantApp();
if (!isEphemeralApp
&& ((info.activityInfo.flags & ActivityInfo.FLAG_VISIBLE_TO_INSTANT_APP) != 0)) {
continue; continue;
} }
resolveInfos.remove(i); resolveInfos.remove(i);