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

Jean-Baptiste Queru · Android Git Automerger · commit 342c6bc8e5ed · 2012-09-05T12:12:56.000-07:00
* commit '540995555505486074e9652a9c682bdf6e3056c5':
  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
@@ -10961,7 +10961,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
`@@ -10961,7 +10961,9 @@ boolean checkAppInLaunchingProvidersLocked(ProcessRecord app, boolean alwaysBad)`
`10961`	`10961`	`restart = true;`
`10962`	`10962`	`} else {`
`10963`	`10963`	`removeDyingProviderLocked(app, cpr, true);`
	`10964`	`+ // cpr should have been removed from mLaunchingProviders`
`10964`	`10965`	`NL = mLaunchingProviders.size();`
	`10966`	`+ i--;`
`10965`	`10967`	`}`
`10966`	`10968`	`}`
`10967`	`10969`	`}`