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

Commit 349254f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow releasing ContentProvider from sdk sandbox." into udc-dev am:... 

Merge "Allow releasing ContentProvider from sdk sandbox." into udc-dev am: e9787e2d am: 1b38328a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22130665



Change-Id: Id60c20fc06d533c8261c9bfab068ad5a63e7e078
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3854dbcc 1b38328a

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

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ public class ContentProviderHelper { 
     * Drop a content provider from a ProcessRecord's bookkeeping

     */

    void removeContentProvider(IBinder connection, boolean stable) {

        mService.enforceNotIsolatedOrSdkSandboxCaller("removeContentProvider");

        mService.enforceNotIsolatedCaller("removeContentProvider");

        final long ident = Binder.clearCallingIdentity();

        try {

            ContentProviderConnection conn;