am 342c6bc: am 5409955: am 380a8e3: Merge "Am: Clean mLaunchingProviders of all providers started by the client"

Jean-Baptiste Queru · Android Git Automerger · commit ec098efcb11c · 2012-09-05T12:36:04.000-07:00
* commit '342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993':
  Am: Clean mLaunchingProviders of all providers started by the client
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
@@ -10621,7 +10621,9 @@ boolean checkAppInLaunchingProvidersLocked(ProcessRecord app, boolean alwaysBad)
                     restart = true;
                 } else {
                     removeDyingProviderLocked(app, cpr, true);
+                    // cpr should have been removed from mLaunchingProviders
                     NL = mLaunchingProviders.size();
+                    i--;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -10621,7 +10621,9 @@ boolean checkAppInLaunchingProvidersLocked(ProcessRecord app, boolean alwaysBad)`
`10621`	`10621`	`restart = true;`
`10622`	`10622`	`} else {`
`10623`	`10623`	`removeDyingProviderLocked(app, cpr, true);`
	`10624`	`+ // cpr should have been removed from mLaunchingProviders`
`10624`	`10625`	`NL = mLaunchingProviders.size();`
	`10626`	`+ i--;`
`10625`	`10627`	`}`
`10626`	`10628`	`}`
`10627`	`10629`	`}`