commit 4cde773435074809672f9de6a47b26de902a83d1
author Victoria Lease <violets@android.com> Fri Mar 14 17:48:00 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 14 17:48:01 2014 +0000
tree 6c8be75255b1b26dd7b08b9538f25ed932531505
parent 629daddd03b598616de7c30a13b1f9f9b11b98fe
parent d5c69462c6ebc71d13e353f179c7549bb75d1dc5

Merge "remove unnecessary switchUser call"

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

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 8f480dd..b4a982e 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/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) {