Merge "remove unnecessary switchUser call"

2014-03-14 17:48:00 +00:00
parent 629daddd03 d5c69462c6
commit 4cde773435
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) {