PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix UnsupportedOperationException from immutable set" into main

Browse Source
This commit is contained in:
Oli Thompson
2024-07-31 10:35:22 +00:00
committed by Android (Google) Code Review
parent d21dec33d1 2a8b7039b0
commit 3554f45f7b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
View File

@@ -72,9 +72,9 @@ import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.LayoutPreference;
import java.util.Collections; import java.util.Arrays;
import java.util.HashSet;
import java.util.Optional; import java.util.Optional;
import java.util.Set;
public class InteractAcrossProfilesDetails extends AppInfoBase public class InteractAcrossProfilesDetails extends AppInfoBase
implements Preference.OnPreferenceClickListener { implements Preference.OnPreferenceClickListener {
@@ -571,8 +571,8 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
String disallowedPackagesString = Settings.Global.getString(getContentResolver(), String disallowedPackagesString = Settings.Global.getString(getContentResolver(),
CONNECTED_APPS_DISALLOWED_PACKAGES); CONNECTED_APPS_DISALLOWED_PACKAGES);
Set<String> allowedPackagesSet = getSetFromString(allowedPackagesString); HashSet<String> allowedPackagesSet = getSetFromString(allowedPackagesString);
Set<String> disallowedPackagesSet = getSetFromString(disallowedPackagesString); HashSet<String> disallowedPackagesSet = getSetFromString(disallowedPackagesString);
if (enabled) { if (enabled) {
allowedPackagesSet.add(crossProfilePackage); allowedPackagesSet.add(crossProfilePackage);
@@ -592,9 +592,9 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
String.join(",", disallowedPackagesSet)); String.join(",", disallowedPackagesSet));
} }
private Set<String> getSetFromString(String packages) { private HashSet<String> getSetFromString(String packages) {
return Optional.ofNullable(packages) return Optional.ofNullable(packages)
.map(pkg -> Set.of(pkg.split(","))) .map(pkg -> new HashSet<>(Arrays.asList(pkg.split(","))))
.orElse(Collections.emptySet()); .orElseGet(HashSet::new);
} }
} }