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

Update the UIDs only after the native network is created

Browse Source 
UIDs can't be sent to netd until the native network is created.
Also, it's possible that the interface disappears at any moment,
so in that case catch the ServiceSpecificException.

Test: FrameworksNetTests
Bug: 218100554
Change-Id: I79285166acf5d89aa34107e00dfff963ccc22d52
This commit is contained in:
Chalard Jean
2022-02-06 18:16:04 +09:00
parent d262e71965
commit a7d4766d0d
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7043,7 +7043,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
nai.notifyRegistered(); nai.notifyRegistered();
NetworkInfo networkInfo = nai.networkInfo; NetworkInfo networkInfo = nai.networkInfo;
updateNetworkInfo(nai, networkInfo); updateNetworkInfo(nai, networkInfo);
updateUids(nai, null, nai.networkCapabilities); updateVpnUids(nai, null, nai.networkCapabilities);
} }
private class NetworkOfferInfo implements IBinder.DeathRecipient { private class NetworkOfferInfo implements IBinder.DeathRecipient {
@@ -7679,7 +7679,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
updateNetworkPermissions(nai, newNc); updateNetworkPermissions(nai, newNc);
final NetworkCapabilities prevNc = nai.getAndSetNetworkCapabilities(newNc); final NetworkCapabilities prevNc = nai.getAndSetNetworkCapabilities(newNc);
updateUids(nai, prevNc, newNc); updateVpnUids(nai, prevNc, newNc);
updateAccessUids(nai, prevNc, newNc);
nai.updateScoreForNetworkAgentUpdate(); nai.updateScoreForNetworkAgentUpdate();
if (nai.getCurrentScore() == oldScore && newNc.equalRequestableCapabilities(prevNc)) { if (nai.getCurrentScore() == oldScore && newNc.equalRequestableCapabilities(prevNc)) {
@@ -7849,12 +7850,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private void updateUids(@NonNull NetworkAgentInfo nai, @Nullable NetworkCapabilities prevNc,
@Nullable NetworkCapabilities newNc) {
updateVpnUids(nai, prevNc, newNc);
updateAccessUids(nai, prevNc, newNc);
}
private void updateVpnUids(@NonNull NetworkAgentInfo nai, @Nullable NetworkCapabilities prevNc, private void updateVpnUids(@NonNull NetworkAgentInfo nai, @Nullable NetworkCapabilities prevNc,
@Nullable NetworkCapabilities newNc) { @Nullable NetworkCapabilities newNc) {
Set<UidRange> prevRanges = null == prevNc ? null : prevNc.getUidRanges(); Set<UidRange> prevRanges = null == prevNc ? null : prevNc.getUidRanges();
@@ -7911,7 +7906,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} catch (Exception e) { } catch (Exception e) {
// Never crash! // Never crash!
loge("Exception in updateUids: ", e); loge("Exception in updateVpnUids: ", e);
} }
} }
@@ -7950,6 +7945,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
intsToUidRangeStableParcels(toRemove), intsToUidRangeStableParcels(toRemove),
PREFERENCE_ORDER_IRRELEVANT_BECAUSE_NOT_DEFAULT)); PREFERENCE_ORDER_IRRELEVANT_BECAUSE_NOT_DEFAULT));
} }
} catch (ServiceSpecificException e) {
// Has the interface disappeared since the network was built ?
Log.i(TAG, "Can't set access UIDs for network " + nai.network, e);
} catch (RemoteException e) { } catch (RemoteException e) {
// Netd died. This usually causes a runtime restart anyway. // Netd died. This usually causes a runtime restart anyway.
} }
@@ -8864,6 +8862,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
networkAgent.created = true; networkAgent.created = true;
networkAgent.onNetworkCreated(); networkAgent.onNetworkCreated();
updateAccessUids(networkAgent, null, networkAgent.networkCapabilities);
} }
if (!networkAgent.everConnected && state == NetworkInfo.State.CONNECTED) { if (!networkAgent.everConnected && state == NetworkInfo.State.CONNECTED) {
@@ -8917,7 +8916,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else if (state == NetworkInfo.State.DISCONNECTED) { } else if (state == NetworkInfo.State.DISCONNECTED) {
networkAgent.disconnect(); networkAgent.disconnect();
if (networkAgent.isVPN()) { if (networkAgent.isVPN()) {
updateUids(networkAgent, networkAgent.networkCapabilities, null); updateVpnUids(networkAgent, networkAgent.networkCapabilities, null);
} }
disconnectAndDestroyNetwork(networkAgent); disconnectAndDestroyNetwork(networkAgent);
if (networkAgent.isVPN()) { if (networkAgent.isVPN()) {