summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-10-02 09:36:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-02 09:36:45 -0700
commita48f2419cecf571bbe6500b9e1d7b03c297e9c7c (patch)
tree19339d8bca13f2c0ba7190d4328cb8fbdc0ccba4
parent69c30a49ccc9cd5f2b2a901edec73dbdf90b9edc (diff)
parent0ba4a29c97a8835bdff589c4187ac69d136f0a6a (diff)
downloadframeworks_base-a48f2419cecf571bbe6500b9e1d7b03c297e9c7c.zip
frameworks_base-a48f2419cecf571bbe6500b9e1d7b03c297e9c7c.tar.gz
frameworks_base-a48f2419cecf571bbe6500b9e1d7b03c297e9c7c.tar.bz2
am 0ba4a29c: am 86519dd5: Merge "Use correct method for sparsearray lookup" into klp-dev
* commit '0ba4a29c97a8835bdff589c4187ac69d136f0a6a': Use correct method for sparsearray lookup
-rw-r--r--services/java/com/android/server/am/ActiveServices.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActiveServices.java b/services/java/com/android/server/am/ActiveServices.java
index fa1769f..8f4bf21 100644
--- a/services/java/com/android/server/am/ActiveServices.java
+++ b/services/java/com/android/server/am/ActiveServices.java
@@ -1839,7 +1839,7 @@ public final class ActiveServices {
}
}
} else {
- ServiceMap smap = mServiceMap.valueAt(userId);
+ ServiceMap smap = mServiceMap.get(userId);
if (smap != null) {
ArrayMap<ComponentName, ServiceRecord> items = smap.mServicesByName;
didSomething = collectForceStopServicesLocked(name, userId, evenPersistent,