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

Commit 156e7e60 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 7f477021: Merge "Maybe fix issue #12957738: SecurityException in..." 

* commit '7f477021':
  Maybe fix issue #12957738: SecurityException in...
parents 588f34a9 7f477021

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

+20 −15
Original line number Diff line number Diff line
@@ -7755,6 +7755,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
     */

    public void removeContentProvider(IBinder connection, boolean stable) {

        enforceNotIsolatedCaller("removeContentProvider");

        long ident = Binder.clearCallingIdentity();

        try {

            synchronized (this) {

                ContentProviderConnection conn;

                try {
@@ -7772,6 +7774,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    updateOomAdjLocked();

                }

            }

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

    }















    public void removeContentProviderExternal(String name, IBinder token) {