Merge "Adds instant app visibility to instumentation" into pi-dev am: c0f025b253

am: e5c12bee08

Change-Id: I99c141edb626c1ee7b1d0545af2c684e8225880e
This commit is contained in:
Patrick Baumann
2018-03-07 00:19:00 +00:00
committed by android-build-merger

View File

@@ -4092,8 +4092,15 @@ public class PackageManagerService extends IPackageManager.Stub
return false;
}
if (callerIsInstantApp) {
// request for a specific component; if it hasn't been explicitly exposed, filter
// request for a specific component; if it hasn't been explicitly exposed through
// property or instrumentation target, filter
if (component != null) {
final PackageParser.Instrumentation instrumentation =
mInstrumentation.get(component);
if (instrumentation != null
&& isCallerSameApp(instrumentation.info.targetPackage, callingUid)) {
return false;
}
return !isComponentVisibleToInstantApp(component, componentType);
}
// request for application; if no components have been explicitly exposed, filter