Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix location INTERACT_ACROSS_USERS bug"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-24 21:39:35 +00:00
committed by Android (Google) Code Review
parent 61aa7eeda9 9ebcf05596
commit e012e7a331
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/LocationManagerService.java
View File

@@ -2570,7 +2570,7 @@ public class LocationManagerService extends ILocationManager.Stub {
// Check INTERACT_ACROSS_USERS permission if userId is not current user id.
checkInteractAcrossUsersPermission(userId);
// enable all location providers
// Enable or disable all location providers
synchronized (mLock) {
for(String provider : getAllProviders()) {
setProviderEnabledForUser(provider, enabled, userId);
@@ -2586,10 +2586,10 @@ public class LocationManagerService extends ILocationManager.Stub {
*/
@Override
public boolean isLocationEnabledForUser(int userId) {
// Check INTERACT_ACROSS_USERS permission if userId is not current user id.
checkInteractAcrossUsersPermission(userId);
// If at least one location provider is enabled, return true
synchronized (mLock) {
for (String provider : getAllProviders()) {
if (isProviderEnabledForUser(provider, userId)) {
@@ -2602,7 +2602,7 @@ public class LocationManagerService extends ILocationManager.Stub {
@Override
public boolean isProviderEnabled(String provider) {
return isProviderEnabledForUser(provider, UserHandle.myUserId());
return isProviderEnabledForUser(provider, UserHandle.getCallingUserId());
}
/**