diff options
| author | John Reck <jreck@google.com> | 2015-07-23 17:36:13 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-07-24 00:37:23 +0000 |
| commit | 6b66a4a8a342b8156f73d83771caa1db2f866529 (patch) | |
| tree | 471b52029a97935a8bbabc6f035911f54a765618 | |
| parent | eea9892d9ec24a5a9c4911efec8fe28e3d1af968 (diff) | |
| download | frameworks_base-6b66a4a8a342b8156f73d83771caa1db2f866529.zip frameworks_base-6b66a4a8a342b8156f73d83771caa1db2f866529.tar.gz frameworks_base-6b66a4a8a342b8156f73d83771caa1db2f866529.tar.bz2 | |
use findProcess instead of getProcess
Bug: 22701182
Change-Id: I2ec56c55c49401f2f213bbd318e867fd73b37672
| -rw-r--r-- | cmds/am/src/com/android/commands/am/Am.java | 2 | ||||
| -rw-r--r-- | services/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 d952dfc..96c0dbd 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 <PROCESS>.\n" + + "am send-trim-memory: Send a memory trim event to a <PROCESS>.\n" + "\n" + "<INTENT> specifications include these flags and arguments:\n" + " [-a <ACTION>] [-d <DATA_URI>] [-t <MIME_TYPE>]\n" + diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 4d9695d..bad0668 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; } |