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

Commit 3062e1e8 authored by lucaslin's avatar lucaslin Committed by Lucas Lin
Browse files

Use hasIpv[4|6]DefaultRoute instead of hasIPv[4|6]DefaultRoute 

ConnectivityService is going to be a mainline module, it can only
use formal APIs or @SystemApi. So use @SystemApi
hasIpv4DefaultRoute and hasIpv6DefaultRoute instead of
hasIPv4DefaultRoute and hasIPv6DefaultRoute.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I67e5fa234fbb6d0b9739ae3295eb0b0ea108f582
parent 646ff54f

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

+2 −2
Original line number Diff line number Diff line
@@ -6432,8 +6432,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                && !nai.networkAgentConfig.allowBypass

                && nc.getOwnerUid() != Process.SYSTEM_UID

                && lp.getInterfaceName() != null

                && (lp.hasIPv4DefaultRoute() || lp.hasIpv4UnreachableDefaultRoute())

                && (lp.hasIPv6DefaultRoute() || lp.hasIpv6UnreachableDefaultRoute());

                && (lp.hasIpv4DefaultRoute() || lp.hasIpv4UnreachableDefaultRoute())

                && (lp.hasIpv6DefaultRoute() || lp.hasIpv6UnreachableDefaultRoute());

    }



    private void updateUids(NetworkAgentInfo nai, NetworkCapabilities prevNc,