diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 770aa8a7cf..6e38a3cd91 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -403,44 +403,44 @@ public class ConnectivityService extends IConnectivityManager.Stub /** * For per-app preferences, requests contain an int to signify which request - * should have priority. The priority is passed to netd which will use it - * together with UID ranges to generate the corresponding IP rule. This serves - * to direct device-originated data traffic of the specific UIDs to the correct + * should have priority. The order is passed to netd which will use it together + * with UID ranges to generate the corresponding IP rule. This serves to + * direct device-originated data traffic of the specific UIDs to the correct * default network for each app. - * Priorities passed to netd must be in the 0~999 range. Larger values code for + * Order ints passed to netd must be in the 0~999 range. Larger values code for * a lower priority, {@see NativeUidRangeConfig} * - * Requests that don't code for a per-app preference use PREFERENCE_PRIORITY_INVALID. - * The default request uses PREFERENCE_PRIORITY_DEFAULT. + * Requests that don't code for a per-app preference use PREFERENCE_ORDER_INVALID. + * The default request uses PREFERENCE_ORDER_DEFAULT. */ - // Bound for the lowest valid priority. - static final int PREFERENCE_PRIORITY_LOWEST = 999; - // Used when sending to netd to code for "no priority". - static final int PREFERENCE_PRIORITY_NONE = 0; - // Priority for requests that don't code for a per-app preference. As it is - // out of the valid range, the corresponding priority should be - // PREFERENCE_PRIORITY_NONE when sending to netd. + // Bound for the lowest valid preference order. + static final int PREFERENCE_ORDER_LOWEST = 999; + // Used when sending to netd to code for "no order". + static final int PREFERENCE_ORDER_NONE = 0; + // Order for requests that don't code for a per-app preference. As it is + // out of the valid range, the corresponding order should be + // PREFERENCE_ORDER_NONE when sending to netd. @VisibleForTesting - static final int PREFERENCE_PRIORITY_INVALID = Integer.MAX_VALUE; - // Priority for the default internet request. Since this must always have the + static final int PREFERENCE_ORDER_INVALID = Integer.MAX_VALUE; + // Order for the default internet request. Since this must always have the // lowest priority, its value is larger than the largest acceptable value. As - // it is out of the valid range, the corresponding priority should be - // PREFERENCE_PRIORITY_NONE when sending to netd. - static final int PREFERENCE_PRIORITY_DEFAULT = 1000; + // it is out of the valid range, the corresponding order should be + // PREFERENCE_ORDER_NONE when sending to netd. + static final int PREFERENCE_ORDER_DEFAULT = 1000; // As a security feature, VPNs have the top priority. - static final int PREFERENCE_PRIORITY_VPN = 0; // Netd supports only 0 for VPN. - // Priority of per-app OEM preference. See {@link #setOemNetworkPreference}. + static final int PREFERENCE_ORDER_VPN = 0; // Netd supports only 0 for VPN. + // Order of per-app OEM preference. See {@link #setOemNetworkPreference}. @VisibleForTesting - static final int PREFERENCE_PRIORITY_OEM = 10; - // Priority of per-profile preference, such as used by enterprise networks. + static final int PREFERENCE_ORDER_OEM = 10; + // Order of per-profile preference, such as used by enterprise networks. // See {@link #setProfileNetworkPreference}. @VisibleForTesting - static final int PREFERENCE_PRIORITY_PROFILE = 20; - // Priority of user setting to prefer mobile data even when networks with + static final int PREFERENCE_ORDER_PROFILE = 20; + // Order of user setting to prefer mobile data even when networks with // better scores are connected. // See {@link ConnectivitySettingsManager#setMobileDataPreferredUids} @VisibleForTesting - static final int PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED = 30; + static final int PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED = 30; /** * used internally to clear a wakelock when transitioning @@ -4245,7 +4245,7 @@ public class ConnectivityService extends IConnectivityManager.Stub mNetd.networkRemoveUidRangesParcel(new NativeUidRangeConfig( satisfier.network.getNetId(), toUidRangeStableParcels(nri.getUids()), - nri.getPriorityForNetd())); + nri.getPreferenceOrderForNetd())); } catch (RemoteException e) { loge("Exception setting network preference default network", e); } @@ -5714,8 +5714,8 @@ public class ConnectivityService extends IConnectivityManager.Stub // maximum limit of registered callbacks per UID. final int mAsUid; - // Default network priority of this request. - final int mPreferencePriority; + // Preference order of this request. + final int mPreferenceOrder; // In order to preserve the mapping of NetworkRequest-to-callback when apps register // callbacks using a returned NetworkRequest, the original NetworkRequest needs to be @@ -5747,12 +5747,12 @@ public class ConnectivityService extends IConnectivityManager.Stub NetworkRequestInfo(int asUid, @NonNull final NetworkRequest r, @Nullable final PendingIntent pi, @Nullable String callingAttributionTag) { this(asUid, Collections.singletonList(r), r, pi, callingAttributionTag, - PREFERENCE_PRIORITY_INVALID); + PREFERENCE_ORDER_INVALID); } NetworkRequestInfo(int asUid, @NonNull final List r, @NonNull final NetworkRequest requestForCallback, @Nullable final PendingIntent pi, - @Nullable String callingAttributionTag, final int preferencePriority) { + @Nullable String callingAttributionTag, final int preferenceOrder) { ensureAllNetworkRequestsHaveType(r); mRequests = initializeRequests(r); mNetworkRequestForCallback = requestForCallback; @@ -5770,7 +5770,7 @@ public class ConnectivityService extends IConnectivityManager.Stub */ mCallbackFlags = NetworkCallback.FLAG_NONE; mCallingAttributionTag = callingAttributionTag; - mPreferencePriority = preferencePriority; + mPreferenceOrder = preferenceOrder; } NetworkRequestInfo(int asUid, @NonNull final NetworkRequest r, @Nullable final Messenger m, @@ -5800,7 +5800,7 @@ public class ConnectivityService extends IConnectivityManager.Stub mPerUidCounter.incrementCountOrThrow(mUid); mCallbackFlags = callbackFlags; mCallingAttributionTag = callingAttributionTag; - mPreferencePriority = PREFERENCE_PRIORITY_INVALID; + mPreferenceOrder = PREFERENCE_ORDER_INVALID; linkDeathRecipient(); } @@ -5840,18 +5840,18 @@ public class ConnectivityService extends IConnectivityManager.Stub mPerUidCounter.incrementCountOrThrow(mUid); mCallbackFlags = nri.mCallbackFlags; mCallingAttributionTag = nri.mCallingAttributionTag; - mPreferencePriority = PREFERENCE_PRIORITY_INVALID; + mPreferenceOrder = PREFERENCE_ORDER_INVALID; linkDeathRecipient(); } NetworkRequestInfo(int asUid, @NonNull final NetworkRequest r) { - this(asUid, Collections.singletonList(r), PREFERENCE_PRIORITY_INVALID); + this(asUid, Collections.singletonList(r), PREFERENCE_ORDER_INVALID); } NetworkRequestInfo(int asUid, @NonNull final List r, - final int preferencePriority) { + final int preferenceOrder) { this(asUid, r, r.get(0), null /* pi */, null /* callingAttributionTag */, - preferencePriority); + preferenceOrder); } // True if this NRI is being satisfied. It also accounts for if the nri has its satisifer @@ -5892,17 +5892,17 @@ public class ConnectivityService extends IConnectivityManager.Stub } } - boolean hasHigherPriorityThan(@NonNull final NetworkRequestInfo target) { - // Compare two priorities, larger value means lower priority. - return mPreferencePriority < target.mPreferencePriority; + boolean hasHigherOrderThan(@NonNull final NetworkRequestInfo target) { + // Compare two preference orders. + return mPreferenceOrder < target.mPreferenceOrder; } - int getPriorityForNetd() { - if (mPreferencePriority >= PREFERENCE_PRIORITY_NONE - && mPreferencePriority <= PREFERENCE_PRIORITY_LOWEST) { - return mPreferencePriority; + int getPreferenceOrderForNetd() { + if (mPreferenceOrder >= PREFERENCE_ORDER_NONE + && mPreferenceOrder <= PREFERENCE_ORDER_LOWEST) { + return mPreferenceOrder; } - return PREFERENCE_PRIORITY_NONE; + return PREFERENCE_ORDER_NONE; } @Override @@ -5922,7 +5922,7 @@ public class ConnectivityService extends IConnectivityManager.Stub + " " + mRequests + (mPendingIntent == null ? "" : " to trigger " + mPendingIntent) + " callback flags: " + mCallbackFlags - + " priority: " + mPreferencePriority; + + " order: " + mPreferenceOrder; } } @@ -6514,7 +6514,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // than one request and for multilayer, all requests will track the same uids. if (nri.mRequests.get(0).networkCapabilities.appliesToUid(uid)) { // Find out the highest priority request. - if (nri.hasHigherPriorityThan(highestPriorityNri)) { + if (nri.hasHigherOrderThan(highestPriorityNri)) { highestPriorityNri = nri; } } @@ -6659,7 +6659,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } for (final UidRange range : uids) { if (range.contains(uid)) { - if (nri.hasHigherPriorityThan(highestPriorityNri)) { + if (nri.hasHigherOrderThan(highestPriorityNri)) { highestPriorityNri = nri; } } @@ -7524,10 +7524,10 @@ public class ConnectivityService extends IConnectivityManager.Stub try { if (add) { mNetd.networkAddUidRangesParcel(new NativeUidRangeConfig( - nai.network.netId, ranges, PREFERENCE_PRIORITY_VPN)); + nai.network.netId, ranges, PREFERENCE_ORDER_VPN)); } else { mNetd.networkRemoveUidRangesParcel(new NativeUidRangeConfig( - nai.network.netId, ranges, PREFERENCE_PRIORITY_VPN)); + nai.network.netId, ranges, PREFERENCE_ORDER_VPN)); } } catch (Exception e) { loge("Exception while " + (add ? "adding" : "removing") + " uid ranges " + uidRanges + @@ -7872,13 +7872,13 @@ public class ConnectivityService extends IConnectivityManager.Stub mNetd.networkAddUidRangesParcel(new NativeUidRangeConfig( newDefaultNetwork.network.getNetId(), toUidRangeStableParcels(nri.getUids()), - nri.getPriorityForNetd())); + nri.getPreferenceOrderForNetd())); } if (null != oldDefaultNetwork) { mNetd.networkRemoveUidRangesParcel(new NativeUidRangeConfig( oldDefaultNetwork.network.getNetId(), toUidRangeStableParcels(nri.getUids()), - nri.getPriorityForNetd())); + nri.getPreferenceOrderForNetd())); } } catch (RemoteException | ServiceSpecificException e) { loge("Exception setting app default network", e); @@ -9978,7 +9978,7 @@ public class ConnectivityService extends IConnectivityManager.Stub TYPE_NONE, NetworkRequest.Type.TRACK_DEFAULT)); setNetworkRequestUids(nrs, UidRange.fromIntRanges(pref.capabilities.getUids())); final NetworkRequestInfo nri = new NetworkRequestInfo(Process.myUid(), nrs, - PREFERENCE_PRIORITY_PROFILE); + PREFERENCE_ORDER_PROFILE); result.add(nri); } return result; @@ -9995,7 +9995,7 @@ public class ConnectivityService extends IConnectivityManager.Stub () -> { final ArraySet nris = createNrisFromProfileNetworkPreferences(mProfileNetworkPreferences); - replaceDefaultNetworkRequestsForPreference(nris, PREFERENCE_PRIORITY_PROFILE); + replaceDefaultNetworkRequestsForPreference(nris, PREFERENCE_ORDER_PROFILE); }); // Finally, rematch. rematchAllNetworksAndRequests(); @@ -10035,7 +10035,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } setNetworkRequestUids(requests, ranges); nris.add(new NetworkRequestInfo(Process.myUid(), requests, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED)); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED)); return nris; } @@ -10047,7 +10047,7 @@ public class ConnectivityService extends IConnectivityManager.Stub final ArraySet nris = createNrisFromMobileDataPreferredUids(mMobileDataPreferredUids); replaceDefaultNetworkRequestsForPreference(nris, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED); }); // Finally, rematch. rematchAllNetworksAndRequests(); @@ -10145,7 +10145,7 @@ public class ConnectivityService extends IConnectivityManager.Stub final ArraySet nris = new OemNetworkRequestFactory() .createNrisFromOemNetworkPreferences(preference); - replaceDefaultNetworkRequestsForPreference(nris, PREFERENCE_PRIORITY_OEM); + replaceDefaultNetworkRequestsForPreference(nris, PREFERENCE_ORDER_OEM); }); mOemNetworkPreferences = preference; @@ -10159,11 +10159,11 @@ public class ConnectivityService extends IConnectivityManager.Stub } private void replaceDefaultNetworkRequestsForPreference( - @NonNull final Set nris, final int preferencePriority) { + @NonNull final Set nris, final int preferenceOrder) { // Skip the requests which are set by other network preference. Because the uid range rules // should stay in netd. final Set requests = new ArraySet<>(mDefaultNetworkRequests); - requests.removeIf(request -> request.mPreferencePriority != preferencePriority); + requests.removeIf(request -> request.mPreferenceOrder != preferenceOrder); handleRemoveNetworkRequests(requests); addPerAppDefaultNetworkRequests(nris); } @@ -10358,7 +10358,7 @@ public class ConnectivityService extends IConnectivityManager.Stub ranges.add(new UidRange(uid, uid)); } setNetworkRequestUids(requests, ranges); - return new NetworkRequestInfo(Process.myUid(), requests, PREFERENCE_PRIORITY_OEM); + return new NetworkRequestInfo(Process.myUid(), requests, PREFERENCE_ORDER_OEM); } private NetworkRequest createUnmeteredNetworkRequest() { diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 496102402e..5eaa941e6d 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -125,10 +125,10 @@ import static android.net.resolv.aidl.IDnsResolverUnsolicitedEventListener.VALID import static android.os.Process.INVALID_UID; import static android.system.OsConstants.IPPROTO_TCP; -import static com.android.server.ConnectivityService.PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED; -import static com.android.server.ConnectivityService.PREFERENCE_PRIORITY_OEM; -import static com.android.server.ConnectivityService.PREFERENCE_PRIORITY_PROFILE; -import static com.android.server.ConnectivityService.PREFERENCE_PRIORITY_VPN; +import static com.android.server.ConnectivityService.PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED; +import static com.android.server.ConnectivityService.PREFERENCE_ORDER_OEM; +import static com.android.server.ConnectivityService.PREFERENCE_ORDER_PROFILE; +import static com.android.server.ConnectivityService.PREFERENCE_ORDER_VPN; import static com.android.server.ConnectivityServiceTestUtils.transportToLegacyType; import static com.android.testutils.ConcurrentUtils.await; import static com.android.testutils.ConcurrentUtils.durationOf; @@ -1297,10 +1297,10 @@ public class ConnectivityServiceTest { verify(mMockNetd, times(1)).networkAddUidRangesParcel( new NativeUidRangeConfig(mMockVpn.getNetwork().getNetId(), - toUidRangeStableParcels(uids), PREFERENCE_PRIORITY_VPN)); + toUidRangeStableParcels(uids), PREFERENCE_ORDER_VPN)); verify(mMockNetd, never()).networkRemoveUidRangesParcel(argThat(config -> mMockVpn.getNetwork().getNetId() == config.netId - && PREFERENCE_PRIORITY_VPN == config.subPriority)); + && PREFERENCE_ORDER_VPN == config.subPriority)); mAgentRegistered = true; verify(mMockNetd).networkCreate(nativeNetworkConfigVpn(getNetwork().netId, !mMockNetworkAgent.isBypassableVpn(), mVpnType)); @@ -10478,11 +10478,11 @@ public class ConnectivityServiceTest { if (add) { inOrder.verify(mMockNetd, times(1)).networkAddUidRangesParcel( new NativeUidRangeConfig(mMockVpn.getNetwork().getNetId(), - toUidRangeStableParcels(vpnRanges), PREFERENCE_PRIORITY_VPN)); + toUidRangeStableParcels(vpnRanges), PREFERENCE_ORDER_VPN)); } else { inOrder.verify(mMockNetd, times(1)).networkRemoveUidRangesParcel( new NativeUidRangeConfig(mMockVpn.getNetwork().getNetId(), - toUidRangeStableParcels(vpnRanges), PREFERENCE_PRIORITY_VPN)); + toUidRangeStableParcels(vpnRanges), PREFERENCE_ORDER_VPN)); } inOrder.verify(mMockNetd, times(1)).socketDestroy(eq(toUidRangeStableParcels(vpnRanges)), @@ -10956,7 +10956,7 @@ public class ConnectivityServiceTest { .createNrisFromOemNetworkPreferences( createDefaultOemNetworkPreferences(prefToTest)); final NetworkRequestInfo nri = nris.iterator().next(); - assertEquals(PREFERENCE_PRIORITY_OEM, nri.mPreferencePriority); + assertEquals(PREFERENCE_ORDER_OEM, nri.mPreferenceOrder); final List mRequests = nri.mRequests; assertEquals(expectedNumOfNris, nris.size()); assertEquals(expectedNumOfRequests, mRequests.size()); @@ -10986,7 +10986,7 @@ public class ConnectivityServiceTest { .createNrisFromOemNetworkPreferences( createDefaultOemNetworkPreferences(prefToTest)); final NetworkRequestInfo nri = nris.iterator().next(); - assertEquals(PREFERENCE_PRIORITY_OEM, nri.mPreferencePriority); + assertEquals(PREFERENCE_ORDER_OEM, nri.mPreferenceOrder); final List mRequests = nri.mRequests; assertEquals(expectedNumOfNris, nris.size()); assertEquals(expectedNumOfRequests, mRequests.size()); @@ -11013,7 +11013,7 @@ public class ConnectivityServiceTest { .createNrisFromOemNetworkPreferences( createDefaultOemNetworkPreferences(prefToTest)); final NetworkRequestInfo nri = nris.iterator().next(); - assertEquals(PREFERENCE_PRIORITY_OEM, nri.mPreferencePriority); + assertEquals(PREFERENCE_ORDER_OEM, nri.mPreferenceOrder); final List mRequests = nri.mRequests; assertEquals(expectedNumOfNris, nris.size()); assertEquals(expectedNumOfRequests, mRequests.size()); @@ -11037,7 +11037,7 @@ public class ConnectivityServiceTest { .createNrisFromOemNetworkPreferences( createDefaultOemNetworkPreferences(prefToTest)); final NetworkRequestInfo nri = nris.iterator().next(); - assertEquals(PREFERENCE_PRIORITY_OEM, nri.mPreferencePriority); + assertEquals(PREFERENCE_ORDER_OEM, nri.mPreferenceOrder); final List mRequests = nri.mRequests; assertEquals(expectedNumOfNris, nris.size()); assertEquals(expectedNumOfRequests, mRequests.size()); @@ -11728,11 +11728,11 @@ public class ConnectivityServiceTest { verify(mMockNetd, times(addUidRangesTimes)).networkAddUidRangesParcel(argThat(config -> (useAnyIdForAdd ? true : addUidRangesNetId == config.netId) && Arrays.equals(addedUidRanges, config.uidRanges) - && PREFERENCE_PRIORITY_OEM == config.subPriority)); + && PREFERENCE_ORDER_OEM == config.subPriority)); verify(mMockNetd, times(removeUidRangesTimes)).networkRemoveUidRangesParcel( argThat(config -> (useAnyIdForRemove ? true : removeUidRangesNetId == config.netId) && Arrays.equals(removedUidRanges, config.uidRanges) - && PREFERENCE_PRIORITY_OEM == config.subPriority)); + && PREFERENCE_ORDER_OEM == config.subPriority)); if (shouldDestroyNetwork) { verify(mMockNetd, times(1)) .networkDestroy((useAnyIdForRemove ? anyInt() : eq(removeUidRangesNetId))); @@ -12887,7 +12887,7 @@ public class ConnectivityServiceTest { // is not handled specially, the rules are always active as long as a preference is set. inOrder.verify(mMockNetd).networkAddUidRangesParcel(new NativeUidRangeConfig( mCellNetworkAgent.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + PREFERENCE_ORDER_PROFILE)); // The enterprise network is not ready yet. assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback, @@ -12902,11 +12902,10 @@ public class ConnectivityServiceTest { inOrder.verify(mMockNetd).networkCreate( nativeNetworkConfigPhysical(workAgent.getNetwork().netId, INetd.PERMISSION_SYSTEM)); inOrder.verify(mMockNetd).networkAddUidRangesParcel(new NativeUidRangeConfig( - workAgent.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + workAgent.getNetwork().netId, uidRangeFor(testHandle), PREFERENCE_ORDER_PROFILE)); inOrder.verify(mMockNetd).networkRemoveUidRangesParcel(new NativeUidRangeConfig( mCellNetworkAgent.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + PREFERENCE_ORDER_PROFILE)); // Make sure changes to the work agent send callbacks to the app in the work profile, but // not to the other apps. @@ -12956,7 +12955,7 @@ public class ConnectivityServiceTest { assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback); inOrder.verify(mMockNetd).networkAddUidRangesParcel(new NativeUidRangeConfig( mCellNetworkAgent.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + PREFERENCE_ORDER_PROFILE)); inOrder.verify(mMockNetd).networkDestroy(workAgent.getNetwork().netId); mCellNetworkAgent.disconnect(); @@ -12980,8 +12979,7 @@ public class ConnectivityServiceTest { inOrder.verify(mMockNetd).networkCreate(nativeNetworkConfigPhysical( workAgent2.getNetwork().netId, INetd.PERMISSION_SYSTEM)); inOrder.verify(mMockNetd).networkAddUidRangesParcel(new NativeUidRangeConfig( - workAgent2.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + workAgent2.getNetwork().netId, uidRangeFor(testHandle), PREFERENCE_ORDER_PROFILE)); workAgent2.setNetworkValid(true /* isStrictMode */); workAgent2.mNetworkMonitor.forceReevaluation(Process.myUid()); @@ -13027,8 +13025,7 @@ public class ConnectivityServiceTest { inOrder.verify(mMockNetd).networkCreate(nativeNetworkConfigPhysical( mCellNetworkAgent.getNetwork().netId, INetd.PERMISSION_NONE)); inOrder.verify(mMockNetd).networkAddUidRangesParcel(new NativeUidRangeConfig( - workAgent.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + workAgent.getNetwork().netId, uidRangeFor(testHandle), PREFERENCE_ORDER_PROFILE)); registerDefaultNetworkCallbacks(); @@ -13043,8 +13040,7 @@ public class ConnectivityServiceTest { mProfileDefaultNetworkCallback.expectAvailableCallbacksValidated(mCellNetworkAgent); assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback); inOrder.verify(mMockNetd).networkRemoveUidRangesParcel(new NativeUidRangeConfig( - workAgent.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + workAgent.getNetwork().netId, uidRangeFor(testHandle), PREFERENCE_ORDER_PROFILE)); workAgent.disconnect(); mCellNetworkAgent.disconnect(); @@ -13089,8 +13085,7 @@ public class ConnectivityServiceTest { r -> r.run(), listener); listener.expectOnComplete(); inOrder.verify(mMockNetd).networkAddUidRangesParcel(new NativeUidRangeConfig( - workAgent.getNetwork().netId, uidRangeFor(testHandle2), - PREFERENCE_PRIORITY_PROFILE)); + workAgent.getNetwork().netId, uidRangeFor(testHandle2), PREFERENCE_ORDER_PROFILE)); mProfileDefaultNetworkCallback.expectAvailableCallbacksValidated(workAgent); assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback, @@ -13100,8 +13095,7 @@ public class ConnectivityServiceTest { r -> r.run(), listener); listener.expectOnComplete(); inOrder.verify(mMockNetd).networkAddUidRangesParcel(new NativeUidRangeConfig( - workAgent.getNetwork().netId, uidRangeFor(testHandle4), - PREFERENCE_PRIORITY_PROFILE)); + workAgent.getNetwork().netId, uidRangeFor(testHandle4), PREFERENCE_ORDER_PROFILE)); app4Cb.expectAvailableCallbacksValidated(workAgent); assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback, @@ -13111,8 +13105,7 @@ public class ConnectivityServiceTest { r -> r.run(), listener); listener.expectOnComplete(); inOrder.verify(mMockNetd).networkRemoveUidRangesParcel(new NativeUidRangeConfig( - workAgent.getNetwork().netId, uidRangeFor(testHandle2), - PREFERENCE_PRIORITY_PROFILE)); + workAgent.getNetwork().netId, uidRangeFor(testHandle2), PREFERENCE_ORDER_PROFILE)); mProfileDefaultNetworkCallback.expectAvailableCallbacksValidated(mCellNetworkAgent); assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback, @@ -13141,7 +13134,7 @@ public class ConnectivityServiceTest { mCellNetworkAgent.getNetwork().netId, INetd.PERMISSION_NONE)); inOrder.verify(mMockNetd).networkAddUidRangesParcel(new NativeUidRangeConfig( mCellNetworkAgent.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + PREFERENCE_ORDER_PROFILE)); final Intent removedIntent = new Intent(ACTION_USER_REMOVED); removedIntent.putExtra(Intent.EXTRA_USER, testHandle); @@ -13149,7 +13142,7 @@ public class ConnectivityServiceTest { inOrder.verify(mMockNetd).networkRemoveUidRangesParcel(new NativeUidRangeConfig( mCellNetworkAgent.getNetwork().netId, uidRangeFor(testHandle), - PREFERENCE_PRIORITY_PROFILE)); + PREFERENCE_ORDER_PROFILE)); } /** @@ -13320,7 +13313,7 @@ public class ConnectivityServiceTest { assertEquals(1, nris.size()); assertTrue(nri.isMultilayerRequest()); assertEquals(nri.getUids(), uidRangesForUids(uids)); - assertEquals(PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED, nri.mPreferencePriority); + assertEquals(PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED, nri.mPreferenceOrder); } /** @@ -13372,7 +13365,7 @@ public class ConnectivityServiceTest { final Set uids1 = Set.of(PRIMARY_USER_HANDLE.getUid(TEST_PACKAGE_UID)); final UidRangeParcel[] uidRanges1 = toUidRangeStableParcels(uidRangesForUids(uids1)); final NativeUidRangeConfig config1 = new NativeUidRangeConfig(cellNetId, uidRanges1, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED); setAndUpdateMobileDataPreferredUids(uids1); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(config1); inorder.verify(mMockNetd, never()).networkRemoveUidRangesParcel(any()); @@ -13384,7 +13377,7 @@ public class ConnectivityServiceTest { SECONDARY_USER_HANDLE.getUid(TEST_PACKAGE_UID)); final UidRangeParcel[] uidRanges2 = toUidRangeStableParcels(uidRangesForUids(uids2)); final NativeUidRangeConfig config2 = new NativeUidRangeConfig(cellNetId, uidRanges2, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED); setAndUpdateMobileDataPreferredUids(uids2); inorder.verify(mMockNetd, times(1)).networkRemoveUidRangesParcel(config1); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(config2); @@ -13432,7 +13425,7 @@ public class ConnectivityServiceTest { final Set uids = Set.of(PRIMARY_USER_HANDLE.getUid(TEST_PACKAGE_UID)); final UidRangeParcel[] uidRanges = toUidRangeStableParcels(uidRangesForUids(uids)); final NativeUidRangeConfig wifiConfig = new NativeUidRangeConfig(wifiNetId, uidRanges, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED); setAndUpdateMobileDataPreferredUids(uids); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(wifiConfig); inorder.verify(mMockNetd, never()).networkRemoveUidRangesParcel(any()); @@ -13448,7 +13441,7 @@ public class ConnectivityServiceTest { final int cellNetId = mCellNetworkAgent.getNetwork().netId; final NativeUidRangeConfig cellConfig = new NativeUidRangeConfig(cellNetId, uidRanges, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED); inorder.verify(mMockNetd, times(1)).networkCreate(nativeNetworkConfigPhysical( cellNetId, INetd.PERMISSION_NONE)); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(cellConfig); @@ -13477,7 +13470,7 @@ public class ConnectivityServiceTest { final int cellNetId2 = mCellNetworkAgent.getNetwork().netId; final NativeUidRangeConfig cellConfig2 = new NativeUidRangeConfig(cellNetId2, uidRanges, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED); inorder.verify(mMockNetd, times(1)).networkCreate(nativeNetworkConfigPhysical( cellNetId2, INetd.PERMISSION_NONE)); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(cellConfig2); @@ -13576,7 +13569,7 @@ public class ConnectivityServiceTest { final int[] uids1 = new int[] { PRIMARY_USER_HANDLE.getUid(TEST_PACKAGE_UID) }; final UidRangeParcel[] uidRanges1 = toUidRangeStableParcels(uidRangesForUids(uids1)); final NativeUidRangeConfig config1 = new NativeUidRangeConfig(cellNetId, uidRanges1, - PREFERENCE_PRIORITY_OEM); + PREFERENCE_ORDER_OEM); setupSetOemNetworkPreferenceForPreferenceTest(networkPref, uidRanges1, TEST_PACKAGE_NAME); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(config1); inorder.verify(mMockNetd, never()).networkRemoveUidRangesParcel(any()); @@ -13590,7 +13583,7 @@ public class ConnectivityServiceTest { r -> r.run(), listener); listener.expectOnComplete(); final NativeUidRangeConfig config2 = new NativeUidRangeConfig(workAgent.getNetwork().netId, - uidRangeFor(testHandle), PREFERENCE_PRIORITY_PROFILE); + uidRangeFor(testHandle), PREFERENCE_ORDER_PROFILE); inorder.verify(mMockNetd).networkCreate(nativeNetworkConfigPhysical( workAgent.getNetwork().netId, INetd.PERMISSION_SYSTEM)); inorder.verify(mMockNetd, never()).networkRemoveUidRangesParcel(any()); @@ -13600,7 +13593,7 @@ public class ConnectivityServiceTest { final Set uids2 = Set.of(PRIMARY_USER_HANDLE.getUid(TEST_PACKAGE_UID2)); final UidRangeParcel[] uidRanges2 = toUidRangeStableParcels(uidRangesForUids(uids2)); final NativeUidRangeConfig config3 = new NativeUidRangeConfig(cellNetId, uidRanges2, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED); setAndUpdateMobileDataPreferredUids(uids2); inorder.verify(mMockNetd, never()).networkRemoveUidRangesParcel(any()); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(config3); @@ -13609,7 +13602,7 @@ public class ConnectivityServiceTest { final Set uids3 = Set.of(PRIMARY_USER_HANDLE.getUid(TEST_PACKAGE_UID3)); final UidRangeParcel[] uidRanges3 = toUidRangeStableParcels(uidRangesForUids(uids3)); final NativeUidRangeConfig config4 = new NativeUidRangeConfig(cellNetId, uidRanges3, - PREFERENCE_PRIORITY_OEM); + PREFERENCE_ORDER_OEM); setupSetOemNetworkPreferenceForPreferenceTest(networkPref, uidRanges3, "com.android.test"); inorder.verify(mMockNetd, times(1)).networkRemoveUidRangesParcel(config1); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(config4); @@ -13623,7 +13616,7 @@ public class ConnectivityServiceTest { // Set MOBILE_DATA_PREFERRED_UIDS setting again with same uid as oem network preference. final NativeUidRangeConfig config6 = new NativeUidRangeConfig(cellNetId, uidRanges3, - PREFERENCE_PRIORITY_MOBILE_DATA_PREFERERRED); + PREFERENCE_ORDER_MOBILE_DATA_PREFERERRED); setAndUpdateMobileDataPreferredUids(uids3); inorder.verify(mMockNetd, times(1)).networkRemoveUidRangesParcel(config3); inorder.verify(mMockNetd, times(1)).networkAddUidRangesParcel(config6);