summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Baker-Malone <jbakermalone@google.com>2014-10-16 17:15:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-16 17:15:53 +0000
commitb8aebafab203f83b31eb332ab8e537bb15ea4c8a (patch)
tree9f90f936504c10866938b4205671a3b6f3b6c4d3
parent5c4af2fd1920d459839ed51bd09bd66e7e6723a1 (diff)
parent44ffe56f333d4fd9474f257a5cdefeb3ca7a6dde (diff)
downloadbase-b8aebafab203f83b31eb332ab8e537bb15ea4c8a.tar.gz
Merge "LocalSdk.hasChanged() not correctly synchronized" into studio-1.0-dev automerge: d068389
automerge: 44ffe56 * commit '44ffe56f333d4fd9474f257a5cdefeb3ca7a6dde': LocalSdk.hasChanged() not correctly synchronized
-rwxr-xr-xsdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java
index ec01598598..0dbab3b3f1 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java
@@ -292,10 +292,10 @@ public class LocalSdk {
Collection<LocalDirInfo> dirInfos;
synchronized (mLocalPackages) {
dirInfos = mVisitedDirs.get(filter);
- }
- for(LocalDirInfo dirInfo : dirInfos) {
- if (dirInfo.hasChanged()) {
- return true;
+ for(LocalDirInfo dirInfo : dirInfos) {
+ if (dirInfo.hasChanged()) {
+ return true;
+ }
}
}
}