Merge "Adds instant app visibility to instumentation" into pi-dev (e5c12bee) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4092,8 +4092,15 @@ public class PackageManagerService extends IPackageManager.Stub
	return false;		return false;
	}		}
	if (callerIsInstantApp) {		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) {		if (component != null) {
			final PackageParser.Instrumentation instrumentation =
			mInstrumentation.get(component);
			if (instrumentation != null
			&& isCallerSameApp(instrumentation.info.targetPackage, callingUid)) {
			return false;
			}
	return !isComponentVisibleToInstantApp(component, componentType);		return !isComponentVisibleToInstantApp(component, componentType);
	}		}
	// request for application; if no components have been explicitly exposed, filter		// request for application; if no components have been explicitly exposed, filter