Custom network selection (9028cac4) · Commits · e / os / android_frameworks_base

core/java/android/net/vcn/VcnManager.java

+30 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,36 @@ import java.util.concurrent.Executor;
		public class VcnManager {
		@NonNull private static final String TAG = VcnManager.class.getSimpleName();

		/**
		* Key for WiFi entry RSSI thresholds
		*
		* <p>The VCN will only migrate to a Carrier WiFi network that has a signal strength greater
		* than, or equal to this threshold.
		*
		* <p>WARNING: The VCN does not listen for changes to this key made after VCN startup.
		*
		* @hide
		*/
		@NonNull
		public static final String VCN_NETWORK_SELECTION_WIFI_ENTRY_RSSI_THRESHOLD_KEY =
		"vcn_network_selection_wifi_entry_rssi_threshold";

		/**
		* Key for WiFi entry RSSI thresholds
		*
		* <p>If the VCN's selected Carrier WiFi network has a signal strength less than this threshold,
		* the VCN will attempt to migrate away from the Carrier WiFi network.
		*
		* <p>WARNING: The VCN does not listen for changes to this key made after VCN startup.
		*
		* @hide
		*/
		@NonNull
		public static final String VCN_NETWORK_SELECTION_WIFI_EXIT_RSSI_THRESHOLD_KEY =
		"vcn_network_selection_wifi_exit_rssi_threshold";

		// TODO: Add separate signal strength thresholds for 2.4 GHz and 5GHz

		private static final Map<
		VcnNetworkPolicyChangeListener, VcnUnderlyingNetworkPolicyListenerBinder>
		REGISTERED_POLICY_LISTENERS = new ConcurrentHashMap<>();

services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java

+24 −14

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
		*/
		public void handleSubscriptionsChanged() {
		final Map<ParcelUuid, Set<String>> privilegedPackages = new HashMap<>();
		final Map<Integer, ParcelUuid> newSubIdToGroupMap = new HashMap<>();
		final Map<Integer, SubscriptionInfo> newSubIdToInfoMap = new HashMap<>();

		final List<SubscriptionInfo> allSubs = mSubscriptionManager.getAllSubscriptionInfoList();
		if (allSubs == null) {
		@@ -160,7 +160,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
		}

		// Build subId -> subGrp cache
		newSubIdToGroupMap.put(subInfo.getSubscriptionId(), subInfo.getGroupUuid());
		newSubIdToInfoMap.put(subInfo.getSubscriptionId(), subInfo);

		// Update subscription groups that are both ready, and active. For a group to be
		// considered active, both of the following must be true:
		@@ -186,7 +186,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
		}

		final TelephonySubscriptionSnapshot newSnapshot =
		new TelephonySubscriptionSnapshot(newSubIdToGroupMap, privilegedPackages);
		new TelephonySubscriptionSnapshot(newSubIdToInfoMap, privilegedPackages);

		// If snapshot was meaningfully updated, fire the callback
		if (!newSnapshot.equals(mCurrentSnapshot)) {
		@@ -245,7 +245,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {

		/** TelephonySubscriptionSnapshot is a class containing info about active subscriptions */
		public static class TelephonySubscriptionSnapshot {
		private final Map<Integer, ParcelUuid> mSubIdToGroupMap;
		private final Map<Integer, SubscriptionInfo> mSubIdToInfoMap;
		private final Map<ParcelUuid, Set<String>> mPrivilegedPackages;

		public static final TelephonySubscriptionSnapshot EMPTY_SNAPSHOT =
		@@ -253,12 +253,12 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {

		@VisibleForTesting(visibility = Visibility.PRIVATE)
		TelephonySubscriptionSnapshot(
		@NonNull Map<Integer, ParcelUuid> subIdToGroupMap,
		@NonNull Map<Integer, SubscriptionInfo> subIdToInfoMap,
		@NonNull Map<ParcelUuid, Set<String>> privilegedPackages) {
		Objects.requireNonNull(subIdToGroupMap, "subIdToGroupMap was null");
		Objects.requireNonNull(subIdToInfoMap, "subIdToInfoMap was null");
		Objects.requireNonNull(privilegedPackages, "privilegedPackages was null");

		mSubIdToGroupMap = Collections.unmodifiableMap(subIdToGroupMap);
		mSubIdToInfoMap = Collections.unmodifiableMap(subIdToInfoMap);

		final Map<ParcelUuid, Set<String>> unmodifiableInnerSets = new ArrayMap<>();
		for (Entry<ParcelUuid, Set<String>> entry : privilegedPackages.entrySet()) {
		@@ -285,7 +285,9 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
		/** Returns the Subscription Group for a given subId. */
		@Nullable
		public ParcelUuid getGroupForSubId(int subId) {
		return mSubIdToGroupMap.get(subId);
		return mSubIdToInfoMap.containsKey(subId)
		? mSubIdToInfoMap.get(subId).getGroupUuid()
		: null;
		}

		/**
		@@ -295,8 +297,8 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
		public Set<Integer> getAllSubIdsInGroup(ParcelUuid subGrp) {
		final Set<Integer> subIds = new ArraySet<>();

		for (Entry<Integer, ParcelUuid> entry : mSubIdToGroupMap.entrySet()) {
		if (subGrp.equals(entry.getValue())) {
		for (Entry<Integer, SubscriptionInfo> entry : mSubIdToInfoMap.entrySet()) {
		if (subGrp.equals(entry.getValue().getGroupUuid())) {
		subIds.add(entry.getKey());
		}
		}
		@@ -304,9 +306,17 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
		return subIds;
		}

		/** Checks if the requested subscription is opportunistic */
		@NonNull
		public boolean isOpportunistic(int subId) {
		return mSubIdToInfoMap.containsKey(subId)
		? mSubIdToInfoMap.get(subId).isOpportunistic()
		: false;
		}

		@Override
		public int hashCode() {
		return Objects.hash(mSubIdToGroupMap, mPrivilegedPackages);
		return Objects.hash(mSubIdToInfoMap, mPrivilegedPackages);
		}

		@Override
		@@ -317,7 +327,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {

		final TelephonySubscriptionSnapshot other = (TelephonySubscriptionSnapshot) obj;

		return mSubIdToGroupMap.equals(other.mSubIdToGroupMap)
		return mSubIdToInfoMap.equals(other.mSubIdToInfoMap)
		&& mPrivilegedPackages.equals(other.mPrivilegedPackages);
		}

		@@ -326,7 +336,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
		pw.println("TelephonySubscriptionSnapshot:");
		pw.increaseIndent();

		pw.println("mSubIdToGroupMap: " + mSubIdToGroupMap);
		pw.println("mSubIdToInfoMap: " + mSubIdToInfoMap);
		pw.println("mPrivilegedPackages: " + mPrivilegedPackages);

		pw.decreaseIndent();
		@@ -335,7 +345,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver {
		@Override
		public String toString() {
		return "TelephonySubscriptionSnapshot{ "
		+ "mSubIdToGroupMap=" + mSubIdToGroupMap
		+ "mSubIdToInfoMap=" + mSubIdToInfoMap
		+ ", mPrivilegedPackages=" + mPrivilegedPackages
		+ " }";
		}