Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1596b41c authored by Chalard Jean's avatar Chalard Jean
Browse files

Generalize some PANS methods 

These methods will be reused for 5G slicing and should
have a more generic name/signature.

This is a no-op refactoring.

Test: FrameworksNetTests
Change-Id: I13cf9fc405fef7dc650d5ea7df44d025f6713b46
parent 45d586c6

services/core/java/com/android/server/ConnectivityService.java

+16 −15
Original line number Diff line number Diff line
@@ -7172,7 +7172,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                        toUidRangeStableParcels(nri.getUids()));

            }

        } catch (RemoteException | ServiceSpecificException e) {

            loge("Exception setting OEM network preference default network", e);

            loge("Exception setting app default network", e);

        }

    }
@@ -9057,7 +9057,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        final ArraySet<NetworkRequestInfo> nris =

                new OemNetworkRequestFactory().createNrisFromOemNetworkPreferences(preference);

        updateDefaultNetworksForOemNetworkPreference(nris);

        replaceDefaultNetworkRequestsForPreference(nris);

        mOemNetworkPreferences = preference;

        // TODO http://b/176496396 persist data to shared preferences.
@@ -9070,7 +9070,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

    }



    private void updateDefaultNetworksForOemNetworkPreference(

    private void replaceDefaultNetworkRequestsForPreference(

            @NonNull final Set<NetworkRequestInfo> nris) {

        // Pass in a defensive copy as this collection will be updated on remove.

        handleRemoveNetworkRequests(new ArraySet<>(mDefaultNetworkRequests));
@@ -9156,6 +9156,14 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        return callbackRequestsToRegister;

    }



    private static void setNetworkRequestUids(@NonNull final List<NetworkRequest> requests,

            @NonNull final Set<UidRange> uids) {

        final Set<UidRange> ranges = new ArraySet<>(uids);

        for (final NetworkRequest req : requests) {

            req.networkCapabilities.setUids(ranges);

        }

    }



    /**

     * Class used to generate {@link NetworkRequestInfo} based off of {@link OemNetworkPreferences}.

     */
@@ -9232,7 +9240,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                            + " called with invalid preference of " + preference);

            }



            setOemNetworkRequestUids(requests, uids);

            final ArraySet ranges = new ArraySet<Integer>();

            for (final int uid : uids) {

                ranges.add(new UidRange(uid, uid));

            }

            setNetworkRequestUids(requests, ranges);

            return new NetworkRequestInfo(requests);

        }
@@ -9265,16 +9277,5 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            netCap.setRequestorUidAndPackageName(Process.myUid(), mContext.getPackageName());

            return netCap;

        }



        private void setOemNetworkRequestUids(@NonNull final List<NetworkRequest> requests,

                @NonNull final Set<Integer> uids) {

            final Set<UidRange> ranges = new ArraySet<>();

            for (final int uid : uids) {

                ranges.add(new UidRange(uid, uid));

            }

            for (final NetworkRequest req : requests) {

                req.networkCapabilities.setUids(ranges);

            }

        }

    }

}