Merge "Fix location services for all profiles" into main (341595b7) · Commits · e / os / android_packages_apps_Settings

res/xml/location_services_private_profile.xml

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:title="@string/location_services_screen_title"
		android:key="location_services_private_profile"
		settings:controller="com.android.settings.location.LocationInjectedServicesForPrivateProfilePreferenceController">
		</PreferenceScreen>

src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import androidx.fragment.app.Fragment;

		import com.android.settings.R;
		import com.android.settings.location.LocationServices;
		import com.android.settings.location.LocationServicesForPrivateProfile;
		import com.android.settings.location.LocationServicesForWork;

		/**
		@@ -34,7 +35,7 @@ public class ProfileSelectLocationServicesFragment extends ProfileSelectFragment
		null /* bundle */,
		LocationServices::new,
		LocationServicesForWork::new,
		LocationServices::new);
		LocationServicesForPrivateProfile::new);
		}

		@Override

src/com/android/settings/location/LocationInjectedServiceBasePreferenceController.java

+21 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

src/com/android/settings/location/LocationInjectedServicesForPrivateProfilePreferenceController.java

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.location;

		import android.content.Context;
		import android.os.UserHandle;

		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.Utils;
		import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
		import com.android.settings.widget.RestrictedAppPreference;

		import java.util.List;
		import java.util.Map;

		/**
		* Retrieve the Location Services used in private profile user.
		*/
		public class LocationInjectedServicesForPrivateProfilePreferenceController extends
		LocationInjectedServiceBasePreferenceController {
		public LocationInjectedServicesForPrivateProfilePreferenceController(
		Context context, String key) {
		super(context, key);
		}

		@Override
		protected void injectLocationServices(PreferenceScreen screen) {
		if (!android.os.Flags.allowPrivateProfile()
		\|\| !android.multiuser.Flags.enablePrivateSpaceFeatures()
		\|\| !android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()) {
		return;
		}
		final UserHandle privateProfile = Utils.getProfileOfType(mUserManager,
		ProfileSelectFragment.ProfileType.PRIVATE);
		if (privateProfile == null) {
		return;
		}
		final Map<Integer, List<Preference>> prefs = getLocationServices();
		for (Map.Entry<Integer, List<Preference>> entry : prefs.entrySet()) {
		for (Preference pref : entry.getValue()) {
		if (pref instanceof RestrictedAppPreference) {
		((RestrictedAppPreference) pref).checkRestrictionAndSetDisabled();
		}
		}
		if (entry.getKey() == privateProfile.getIdentifier()) {
		LocationSettings.addPreferencesSorted(entry.getValue(), screen);
		}
		}
		}
		}

src/com/android/settings/location/LocationInjectedServicesForWorkPreferenceController.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.os.UserHandle;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.Utils;
		import com.android.settings.widget.RestrictedAppPreference;

		import java.util.List;
		@@ -40,6 +41,7 @@ public class LocationInjectedServicesForWorkPreferenceController extends

		@Override
		protected void injectLocationServices(PreferenceScreen screen) {
		final int managedProfileId = Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
		final Map<Integer, List<Preference>> prefs = getLocationServices();
		for (Map.Entry<Integer, List<Preference>> entry : prefs.entrySet()) {
		for (Preference pref : entry.getValue()) {
		@@ -47,7 +49,7 @@ public class LocationInjectedServicesForWorkPreferenceController extends
		((RestrictedAppPreference) pref).checkRestrictionAndSetDisabled();
		}
		}
		if (entry.getKey() != UserHandle.myUserId()) {
		if (entry.getKey() == managedProfileId) {
		LocationSettings.addPreferencesSorted(entry.getValue(), screen);
		}
		}