From 3062e1e869ad33fccf6c5889afa8fbed2ceb8414 Mon Sep 17 00:00:00 2001 From: lucaslin Date: Mon, 2 Nov 2020 16:05:02 +0800 Subject: [PATCH] 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 --- .../core/java/com/android/server/ConnectivityService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index da2a3de9f9719..88de82f08e8aa 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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,