joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fallback should be evaluated for each preference" am: 5ea6f517a6 am: 8522fc4532

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2092882

Change-Id: I232ff4d279e7e2d26654637247967055f2e666e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sooraj Sasindran 2022-05-12 00:56:06 +00:00 • committed by Automerger Merge Worker
commit 95aa795f56
1 changed files with 273 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
service/src/com/android/server/ConnectivityService.java
View file

@ -10665,7 +10665,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
Objects.requireNonNull(profile);
if (preferences.size() == 0) {
preferences.add((new ProfileNetworkPreference.Builder()).build());
final ProfileNetworkPreference pref = new ProfileNetworkPreference.Builder()
.setPreference(ConnectivityManager.PROFILE_NETWORK_PREFERENCE_DEFAULT)
.build();
preferences.add(pref);
}
PermissionUtils.enforceNetworkStackPermission(mContext);
@ -10683,12 +10686,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
final List<ProfileNetworkPreferenceList.Preference> preferenceList =
new ArrayList<ProfileNetworkPreferenceList.Preference>();
boolean allowFallback = true;
boolean hasDefaultPreference = false;
for (final ProfileNetworkPreference preference : preferences) {
final NetworkCapabilities nc;
boolean allowFallback = true;
switch (preference.getPreference()) {
case ConnectivityManager.PROFILE_NETWORK_PREFERENCE_DEFAULT:
nc = null;
hasDefaultPreference = true;
if (preference.getPreferenceEnterpriseId() != 0) {
throw new IllegalArgumentException(
"Invalid enterprise identifier in setProfileNetworkPreferences");
@ -10698,6 +10703,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
allowFallback = false;
// continue to process the enterprise preference.
case ConnectivityManager.PROFILE_NETWORK_PREFERENCE_ENTERPRISE:
// This code is needed even though there is a check later on,
// because isRangeAlreadyInPreferenceList assumes that every preference
// has a UID list.
if (hasDefaultPreference) {
throw new IllegalArgumentException(
"Default profile preference should not be set along with other "
+ "preference");
}
if (!isEnterpriseIdentifierValid(preference.getPreferenceEnterpriseId())) {
throw new IllegalArgumentException(
"Invalid enterprise identifier in setProfileNetworkPreferences");
@ -10721,6 +10734,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
preferenceList.add(new ProfileNetworkPreferenceList.Preference(
profile, nc, allowFallback));
if (hasDefaultPreference && preferenceList.size() > 1) {
throw new IllegalArgumentException(
"Default profile preference should not be set along with other preference");
}
}
mHandler.sendMessage(mHandler.obtainMessage(EVENT_SET_PROFILE_NETWORK_PREFERENCE,
new Pair<>(preferenceList, listener)));
@ -10765,12 +10782,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
return false;
}
private void validateNetworkCapabilitiesOfProfileNetworkPreference(
@Nullable final NetworkCapabilities nc) {
if (null == nc) return; // Null caps are always allowed. It means to remove the setting.
ensureRequestableCapabilities(nc);
}
private ArraySet<NetworkRequestInfo> createNrisFromProfileNetworkPreferences(
@NonNull final ProfileNetworkPreferenceList prefs) {
final ArraySet<NetworkRequestInfo> result = new ArraySet<>();
@ -10828,10 +10839,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
* Clear all the existing preferences for the user before applying new preferences.
*
*/
mProfileNetworkPreferences = mProfileNetworkPreferences.clearUser(
mProfileNetworkPreferences = mProfileNetworkPreferences.withoutUser(
preferenceList.get(0).user);
for (final ProfileNetworkPreferenceList.Preference preference : preferenceList) {
validateNetworkCapabilitiesOfProfileNetworkPreference(preference.capabilities);
mProfileNetworkPreferences = mProfileNetworkPreferences.plus(preference);
}