Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable freezer during AM provider/service dump" into udc-dev

Browse Source
This commit is contained in:
Kevin Jeon
2023-04-13 20:43:40 +00:00
committed by Android (Google) Code Review
parent 884ee1d958 fc854c65b5
commit 8b5f672cdc
2 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -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);
}
} }
/** /**

5
services/core/java/com/android/server/am/ProviderMap.java
View File

@@ -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);
}
} }
/** /**