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

* commit 'f8ce43ea146cace780cb4f75348d4eca4526660a': remove unnecessary switchUser call
2014-03-14 17:57:32 +00:00
parent d387206a84 f8ce43ea14
commit c2d934d7e8
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -452,6 +452,9 @@ public class LocationManagerService extends ILocationManager.Stub {
     * @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) {