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

Commit 9ac25b31 authored by Varun Shah's avatar Varun Shah Committed by Android (Google) Code Review
Browse files

Merge changes I65974f90,I98015097 

* changes:
  Clean up some of the Content Provider code.
  Reorganize some of the ContentProvider methods.
parents d50f5137 67640823

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

+1 −1
Original line number Diff line number Diff line
@@ -13394,7 +13394,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
        // XXX Commented out for now.  Trying to figure out a way to reproduce

        // the actual situation to identify what is actually going on.

        if (false) {

            mCpHelper.cleanupLaunchingProviders();

            mCpHelper.cleanupLaunchingProvidersLocked();

        }















        skipCurrentReceiverLocked(app);

























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



+1007
−1036


























File changed.
Preview size limit exceeded, changes collapsed.