Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96c5a817 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "don't blindly reuse content providers" into oc-dev am: 9b32a057 

am: 21967abb

Change-Id: I990d53630facae05a697b1fbffec6f03534b89af
parents a7751f38 21967abb

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -11256,6 +11256,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    holder.provider = null;

                    return holder;

                }

                // Don't expose instant app providers

                if (cpr.appInfo.isInstantApp()) {

                    return null;

                }















                final long origId = Binder.clearCallingIdentity();