commit c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460
author Victoria Lease <violets@android.com> Fri Mar 14 17:57:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 17:57:32 2014 +0000
tree 9c7c1967b59b377dcdfda12d44f927b521651029
parent d387206a84a35b86663adb5bf00671cafbf6aee4
parent f8ce43ea146cace780cb4f75348d4eca4526660a

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

* commit 'f8ce43ea146cace780cb4f75348d4eca4526660a':
  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 eebd1c5..e0b568b 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -452,6 +452,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) {