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

Fix location services for all profiles

Browse Source 
Bug: 330538899
Bug: 333507072
Test: atest LocationInjectedServicesPreferenceControllerTest
Test: manual
Change-Id: Ia42e59b73b9b7c84ecb89082e968b801e1fd1302
This commit is contained in:
Manish Singh
2024-04-09 15:41:26 +00:00
parent cf7cfa6a0c
commit cace44f497
7 changed files with 247 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/location/LocationInjectedServiceBasePreferenceController.java
View File

@@ -22,6 +22,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.location.SettingInjectorService;
import android.os.UserHandle;
import android.util.ArraySet;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
@@ -32,6 +33,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import java.util.List;
@@ -110,13 +112,28 @@ public abstract class LocationInjectedServiceBasePreferenceController
}
protected Map<Integer, List<Preference>> getLocationServices() {
ArraySet<UserHandle> userHandles = new ArraySet<>();
userHandles.add(UserHandle.of(UserHandle.myUserId()));
// If location access is locked down by device policy then we only show injected settings
// for the primary profile.
final int profileUserId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
final int managedProfileId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
if (managedProfileId != UserHandle.USER_NULL
&& mLocationEnabler.getShareLocationEnforcedAdmin(managedProfileId) == null) {
userHandles.add(UserHandle.of(managedProfileId));
}
if (android.os.Flags.allowPrivateProfile()
&& android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()) {
final UserHandle privateProfile = Utils.getProfileOfType(mUserManager,
ProfileSelectFragment.ProfileType.PRIVATE);
if (privateProfile != null && mLocationEnabler
.getShareLocationEnforcedAdmin(privateProfile.getIdentifier()) == null) {
userHandles.add(privateProfile);
}
}
return mInjector.getInjectedSettings(mFragment.getPreferenceManager().getContext(),
(profileUserId != UserHandle.USER_NULL
&& mLocationEnabler.getShareLocationEnforcedAdmin(profileUserId) != null)
? UserHandle.myUserId() : UserHandle.USER_CURRENT);
userHandles);
}
}