commit 755a4e7715bb0ee1c72e2f7ec88b525a54632604
author Ken Chen <cken@google.com> Wed May 12 13:38:13 2021 +0800
committer Ken Chen <cken@google.com> Wed May 12 13:44:40 2021 +0800
tree f1b544858af283520440740edc728907b69d0b69
parent 6df7a90c1f63448a5754a6a244f8e7b4597e8e88

Better log in createNativeNetwork

Dump more information from NetworkAgentInfo in error log.

Bug: N/A
Test: m
Change-Id: I92981c03ad80e8b1d7ffaf45d50cc0bfd0b283b0

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 2fcb95c..20a6b73 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3812,7 +3812,7 @@
             final NativeNetworkConfig config;
             if (nai.isVPN()) {
                 if (getVpnType(nai) == VpnManager.TYPE_VPN_NONE) {
-                    Log.wtf(TAG, "Unable to get VPN type from network " + nai.network.getNetId());
+                    Log.wtf(TAG, "Unable to get VPN type from network " + nai.toShortString());
                     return false;
                 }
                 config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.VIRTUAL,
@@ -3830,7 +3830,7 @@
                     nai.networkCapabilities.getTransportTypes());
             return true;
         } catch (RemoteException | ServiceSpecificException e) {
-            loge("Error creating network " + nai.network.getNetId() + ": " + e.getMessage());
+            loge("Error creating network " + nai.toShortString() + ": " + e.getMessage());
             return false;
         }
     }