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

Commit 21967abb 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

Change-Id: I3d4fc2c9d877a0065e67ca9ec7d5f3cfedec9046
parents 31d5f7ee 9b32a057

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();