diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-05-29 22:04:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-29 22:04:01 +0000 |
| commit | 9b76b2d29fa338a128f699a1f40f7f5916a512af (patch) | |
| tree | 36d4826f134b7aa9f28dba3883c20c6115494445 /services | |
| parent | 09377ddb93a964b9e0def6d84b8beb3a515f4a18 (diff) | |
| parent | cca0965a1baa0c36d361127f94076943dd3d2803 (diff) | |
| download | frameworks_base-9b76b2d29fa338a128f699a1f40f7f5916a512af.zip frameworks_base-9b76b2d29fa338a128f699a1f40f7f5916a512af.tar.gz frameworks_base-9b76b2d29fa338a128f699a1f40f7f5916a512af.tar.bz2 | |
Merge "framework:base: iterator error in singletone provider"
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index c6efe15b..3582a41 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -6267,6 +6267,7 @@ public final class ActivityManagerService extends ActivityManagerNative // it runs in the process of the default user. Get rid of it. providers.remove(i); N--; + i--; continue; } |