From 6b66a4a8a342b8156f73d83771caa1db2f866529 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 23 Jul 2015 17:36:13 -0700 Subject: [PATCH] use findProcess instead of getProcess Bug: 22701182 Change-Id: I2ec56c55c49401f2f213bbd318e867fd73b37672 --- cmds/am/src/com/android/commands/am/Am.java | 2 +- .../core/java/com/android/server/am/ActivityManagerService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index d952dfc945f9b..96c0dbddee419 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -295,7 +295,7 @@ public class Am extends BaseCommand { "\n" + "am get-inactive: returns the inactive state of an app.\n" + "\n" + - " am send-trim-memory: Send a memory trim event to a .\n" + + "am send-trim-memory: Send a memory trim event to a .\n" + "\n" + " specifications include these flags and arguments:\n" + " [-a ] [-d ] [-t ]\n" + diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 4d9695d406ced..bad0668a29804 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -3652,7 +3652,7 @@ public final class ActivityManagerService extends ActivityManagerNative @Override public boolean setProcessMemoryTrimLevel(String process, int userId, int level) { synchronized (this) { - final ProcessRecord app = getProcessRecordLocked(process, userId, true); + final ProcessRecord app = findProcessLocked(process, userId, "setProcessMemoryTrimLevel"); if (app == null) { return false; }