Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed race condition by using a separate counter" into nyc-mr1-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2016-06-29 15:59:47 +00:00
committed by Android (Google) Code Review
parent 488153094c 3864183146
commit d2e8ae4a90
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/UserController.java
View File

@@ -99,6 +99,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
/** /**
* Helper class for {@link ActivityManagerService} responsible for multi-user functionality. * Helper class for {@link ActivityManagerService} responsible for multi-user functionality.
@@ -1057,6 +1058,7 @@ final class UserController {
uss.switching = true; uss.switching = true;
mCurWaitingUserSwitchCallbacks = curWaitingUserSwitchCallbacks; mCurWaitingUserSwitchCallbacks = curWaitingUserSwitchCallbacks;
} }
final AtomicInteger waitingCallbacksCount = new AtomicInteger(observerCount);
for (int i = 0; i < observerCount; i++) { for (int i = 0; i < observerCount; i++) {
try { try {
// Prepend with unique prefix to guarantee that keys are unique // Prepend with unique prefix to guarantee that keys are unique
@@ -1075,7 +1077,7 @@ final class UserController {
} }
curWaitingUserSwitchCallbacks.remove(name); curWaitingUserSwitchCallbacks.remove(name);
// Continue switching if all callbacks have been notified // Continue switching if all callbacks have been notified
if (curWaitingUserSwitchCallbacks.isEmpty()) { if (waitingCallbacksCount.decrementAndGet() == 0) {
sendContinueUserSwitchLocked(uss, oldUserId, newUserId); sendContinueUserSwitchLocked(uss, oldUserId, newUserId);
} }
} }