Merge "Using defensive copy for default request remove"
This commit is contained in:
@@ -9033,7 +9033,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
|
|
||||||
private void updateDefaultNetworksForOemNetworkPreference(
|
private void updateDefaultNetworksForOemNetworkPreference(
|
||||||
@NonNull final Set<NetworkRequestInfo> nris) {
|
@NonNull final Set<NetworkRequestInfo> nris) {
|
||||||
handleRemoveNetworkRequests(mDefaultNetworkRequests);
|
// Pass in a defensive copy as this collection will be updated on remove.
|
||||||
|
handleRemoveNetworkRequests(new ArraySet<>(mDefaultNetworkRequests));
|
||||||
addPerAppDefaultNetworkRequests(nris);
|
addPerAppDefaultNetworkRequests(nris);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user