am 4cde7734: Merge "remove unnecessary switchUser call"

* commit '4cde773435074809672f9de6a47b26de902a83d1': remove unnecessary switchUser call
2014-03-14 10:51:45 -07:00
parent c0232642b7 4cde773435
commit 1365d98270
1 changed files with 3 additions and 0 deletions
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/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) {