commit 09d47bbb43fcda1d1cc05f88849ed011a84d0d60
author Victoria Lease <violets@android.com> Fri Mar 14 18:01:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 18:01:38 2014 +0000
tree 211f970a3ee42c8e31e685819c0c9536a2a2e953
parent 4656ac9fe6de1f67026f5bef1c55cb14ba4c0b13
parent c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460

am c2d934d7: am f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"

* commit 'c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460':
  remove unnecessary switchUser call

services/core/java/com/android/server/LocationManagerService.java

diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index 3dcb488..e6163bd 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -457,6 +457,9 @@
      * @param userId the new active user's UserId
      */
     private void switchUser(int userId) {
+        if (mCurrentUserId == userId) {
+            return;
+        }
         mBlacklist.switchUser(userId);
         mLocationHandler.removeMessages(MSG_LOCATION_CHANGED);
         synchronized (mLock) {