commit 4728eb09248518d66e83e836797872c1ca631b25
author Ken Chen <cken@google.com> Thu May 13 02:01:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 13 02:01:21 2021 +0000
tree 171cda4d0dd5dec6d9301f6ad83d158074ee566b
parent aa243fe3ba1b78f5d0a601664fd3f5584e5893ba
parent 37dec89b65fb23921a99e2e8fe3fc816bad310ef

Merge "Better log in createNativeNetwork" am: 37dec89b65

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925

Change-Id: Ic8afb71d7ac099f6c492dda8f9f54a5da3c79649

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 75fbb9f..39a990c 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;
         }
     }