Fix trySetQuietModeDisabled may introduce deadlock

1. UserController.mLock is held
2. mUnlockProgress.addListener
3. Find that it is unlocked and hence, call the onFinished callback
   right away.
4. Trying to call the callback in UMS, which calls startIntentSender.
5. startIntentSender requires AMS lock.

So, if there is another thread is holding AMS lock and
waiting for UserController.mLock, deadlock happens.

Test: Try turning on / off work mode

Change-Id: I341c2f1572302863d7972742142aa0f3948cd524

1 files changed, 3 insertions, 4 deletions

diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 6bd599bb0198..14260c5fb105 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -926,10 +926,9 @@ class UserController implements Handler.Callback {
                 final Integer userIdInt = userId;
                 mUserLru.remove(userIdInt);
                 mUserLru.add(userIdInt);
-
-                if (unlockListener != null) {
-                    uss.mUnlockProgress.addListener(unlockListener);
-                }
+            }
+            if (unlockListener != null) {
+                uss.mUnlockProgress.addListener(unlockListener);
             }
             if (updateUmState) {
                 mInjector.getUserManagerInternal().setUserState(userId, uss.state);