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

Merge "Filter instant apps with different names" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-26 20:06:19 +00:00
committed by Android (Google) Code Review
parent aa2286e417 1dfb21b673
commit adcc94f160
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7207,12 +7207,15 @@ public class PackageManagerService extends IPackageManager.Stub
// load resources from the correct package // load resources from the correct package
installerInfo.resolvePackageName = info.getComponentInfo().packageName; installerInfo.resolvePackageName = info.getComponentInfo().packageName;
resolveInfos.set(i, installerInfo); resolveInfos.set(i, installerInfo);
continue;
} }
continue;
} }
// caller is a full app, don't need to apply any other filtering // caller is a full app, don't need to apply any other filtering
if (ephemeralPkgName == null) { if (ephemeralPkgName == null) {
continue; continue;
} else if (ephemeralPkgName.equals(info.activityInfo.packageName)) {
// caller is same app; don't need to apply any other filtering
continue;
} }
// allow activities that have been explicitly exposed to ephemeral apps // allow activities that have been explicitly exposed to ephemeral apps
if (!isEphemeralApp if (!isEphemeralApp