LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NS04.7] Reinstate a necessary change

Browse Source 
NS04.5 removed a security that it shouldn't have. Reinstate it.

Bug: 167544279
Test: ConnectivityServiceTest
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: If614da813a96d1b50a16fa4be5659e1647d9469d
Change-Id: If614da813a96d1b50a16fa4be5659e1647d9469d
  (cherry-picked from ag/13975118)
This commit is contained in:
Chalard Jean
2021-03-24 14:31:38 +09:00
committed by Junyu Lai
parent 30689b8fd7
commit dd35f2dab0
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
service/src/com/android/server/ConnectivityService.java
View File

@@ -6644,6 +6644,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private boolean isNetworkProviderWithIdRegistered(final int providerId) {
for (final NetworkProviderInfo npi : mNetworkProviderInfos.values()) {
if (npi.providerId == providerId) return true;
}
return false;
}
/** /**
* Register or update a network offer. * Register or update a network offer.
* @param newOffer The new offer. If the callback member is the same as an existing * @param newOffer The new offer. If the callback member is the same as an existing
@@ -6651,6 +6658,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
*/ */
private void handleRegisterNetworkOffer(@NonNull final NetworkOffer newOffer) { private void handleRegisterNetworkOffer(@NonNull final NetworkOffer newOffer) {
ensureRunningOnConnectivityServiceThread(); ensureRunningOnConnectivityServiceThread();
if (!isNetworkProviderWithIdRegistered(newOffer.providerId)) {
// This may actually happen if a provider updates its score or registers and then
// immediately unregisters. The offer would still be in the handler queue, but the
// provider would have been removed.
if (DBG) log("Received offer from an unregistered provider");
return;
}
final NetworkOfferInfo existingOffer = findNetworkOfferInfoByCallback(newOffer.callback); final NetworkOfferInfo existingOffer = findNetworkOfferInfoByCallback(newOffer.callback);
if (null != existingOffer) { if (null != existingOffer) {