Merge "Adds instant app visibility to instumentation" into pi-dev
am: c0f025b253
Change-Id: I8a161d6eee0c8d4404edf19191f5b3b0d9fc2eec
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user