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

Commit dbfffded authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

Merge "Disable freezer during AM provider/service dump" into udc-dev am: 8b5f672c 

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



Change-Id: I03a34aea3eba872e1e36fd0ce039d73e64b6b60f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 714b3f0f 8b5f672c

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

+34 −29
Original line number Original line Diff line number Diff line
@@ -7258,6 +7258,8 @@ public final class ActiveServices { 
     */

     */

    protected boolean dumpService(FileDescriptor fd, PrintWriter pw, String name, int[] users,

    protected boolean dumpService(FileDescriptor fd, PrintWriter pw, String name, int[] users,

            String[] args, int opti, boolean dumpAll) {

            String[] args, int opti, boolean dumpAll) {

        try {

            mAm.mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);

            final ArrayList<ServiceRecord> services = new ArrayList<>();

            final ArrayList<ServiceRecord> services = new ArrayList<>();





            final Predicate<ServiceRecord> filter = DumpUtils.filterRecord(name);

            final Predicate<ServiceRecord> filter = DumpUtils.filterRecord(name);
@@ -7299,6 +7301,9 @@ public final class ActiveServices { 
                dumpService("", fd, pw, services.get(i), args, dumpAll);

                dumpService("", fd, pw, services.get(i), args, dumpAll);

            }

            }

            return true;

            return true;

        } finally {

            mAm.mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);

        }

    }

    }





    /**

    /**

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

+16 −11
Original line number Original line Diff line number Diff line
@@ -351,6 +351,8 @@ public final class ProviderMap { 




    protected boolean dumpProvider(FileDescriptor fd, PrintWriter pw, String name, String[] args,

    protected boolean dumpProvider(FileDescriptor fd, PrintWriter pw, String name, String[] args,

            int opti, boolean dumpAll) {

            int opti, boolean dumpAll) {

        try {

            mAm.mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);

            ArrayList<ContentProviderRecord> providers = getProvidersForName(name);

            ArrayList<ContentProviderRecord> providers = getProvidersForName(name);





            if (providers.size() <= 0) {

            if (providers.size() <= 0) {
@@ -366,6 +368,9 @@ public final class ProviderMap { 
                dumpProvider("", fd, pw, providers.get(i), args, dumpAll);

                dumpProvider("", fd, pw, providers.get(i), args, dumpAll);

            }

            }

            return true;

            return true;

        } finally {

            mAm.mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);

        }

    }

    }





    /**

    /**