diff options
| author | Victoria Lease <violets@android.com> | 2014-03-14 17:54:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 17:54:32 +0000 |
| commit | f8ce43ea146cace780cb4f75348d4eca4526660a (patch) | |
| tree | 0378e3005a5824d5a88d46ebc71fb67f167a152e /services/core/java/com/android/server/LocationManagerService.java | |
| parent | 7890eeff3adc862160b0da257a9524c540fc1fa7 (diff) | |
| parent | 1365d98270e0a0a61d10743820e923aeff974b39 (diff) | |
| download | frameworks_base-f8ce43ea146cace780cb4f75348d4eca4526660a.zip frameworks_base-f8ce43ea146cace780cb4f75348d4eca4526660a.tar.gz frameworks_base-f8ce43ea146cace780cb4f75348d4eca4526660a.tar.bz2 | |
am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"
* commit '1365d98270e0a0a61d10743820e923aeff974b39':
remove unnecessary switchUser call
Diffstat (limited to 'services/core/java/com/android/server/LocationManagerService.java')
| -rw-r--r-- | services/core/java/com/android/server/LocationManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index eebd1c5..e0b568b 100644 --- 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) { |