summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2016-05-13 14:30:15 -0700
committerSteve Kondik <shade@chemlab.org>2016-05-13 22:17:23 -0700
commit50734c25acdc593d570696c15b7b44dc0264b6a3 (patch)
tree3035756859c3534002259f71a726fffe420d5e53 /services
parent448c4a553e5699026e4bf20903883a738ed8a922 (diff)
downloadframeworks_base-50734c25acdc593d570696c15b7b44dc0264b6a3.zip
frameworks_base-50734c25acdc593d570696c15b7b44dc0264b6a3.tar.gz
frameworks_base-50734c25acdc593d570696c15b7b44dc0264b6a3.tar.bz2
ActivityManager: fix perf boost NPE
Able to get an NPE by factory resetting a device, and then just rebooting it. Change-Id: I6f5bbcf59dc20a75a209d6d70e6c3e35fff01406 Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'services')
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index cf075a89..72f8f0e 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3619,7 +3619,7 @@ public final class ActivityManagerService extends ActivityManagerNative
StringBuilder buf = mStringBuilder;
buf.setLength(0);
if (hostingType.equals("activity")) {
- mPerf.launchBoost(startResult.pid, app.processName);
+ launchBoost(startResult.pid, app.processName);
}
buf.append("Start proc ");
buf.append(startResult.pid);