LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change I1a00abb0 into eclair-sdk

Browse Source 
* changes:
  Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
This commit is contained in:
Android (Google) Code Review
2009-10-19 17:24:34 -04:00
parent 5cff81bb58 1a00abb0ae
commit fc5b5aecde
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
View File

@@ -1045,12 +1045,12 @@ public class AdtPlugin extends AbstractUIPlugin {
} }
} }
ArrayList<IJavaProject> list = new ArrayList<IJavaProject>();
synchronized (getSdkLockObject()) { synchronized (getSdkLockObject()) {
mSdkIsLoaded = LoadStatus.LOADED; mSdkIsLoaded = LoadStatus.LOADED;
progress.setTaskName("Check Projects"); progress.setTaskName("Check Projects");
ArrayList<IJavaProject> list = new ArrayList<IJavaProject>();
for (IJavaProject javaProject : mPostLoadProjectsToResolve) { for (IJavaProject javaProject : mPostLoadProjectsToResolve) {
if (javaProject.getProject().isOpen()) { if (javaProject.getProject().isOpen()) {
list.add(javaProject); list.add(javaProject);
@@ -1059,6 +1059,7 @@ public class AdtPlugin extends AbstractUIPlugin {
// done with this list. // done with this list.
mPostLoadProjectsToResolve.clear(); mPostLoadProjectsToResolve.clear();
}
// check the projects that need checking. // check the projects that need checking.
// The method modifies the list (it removes the project that // The method modifies the list (it removes the project that
@@ -1077,7 +1078,6 @@ public class AdtPlugin extends AbstractUIPlugin {
progress.worked(10); progress.worked(10);
} }
}
// Notify resource changed listeners // Notify resource changed listeners
progress.setTaskName("Refresh UI"); progress.setTaskName("Refresh UI");