diff options
| author | Victoria Lease <violets@android.com> | 2014-03-14 10:51:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 10:51:45 -0700 |
| commit | 1365d98270e0a0a61d10743820e923aeff974b39 (patch) | |
| tree | 9e5b84e932105ca11de24531125593dbc3c0218f | |
| parent | c0232642b74517aa2717673f0811ba65c620f491 (diff) | |
| parent | 4cde773435074809672f9de6a47b26de902a83d1 (diff) | |
| download | frameworks_base-1365d98270e0a0a61d10743820e923aeff974b39.zip frameworks_base-1365d98270e0a0a61d10743820e923aeff974b39.tar.gz frameworks_base-1365d98270e0a0a61d10743820e923aeff974b39.tar.bz2 | |
am 4cde7734: Merge "remove unnecessary switchUser call"
* commit '4cde773435074809672f9de6a47b26de902a83d1':
remove unnecessary switchUser call
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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) { |