commit 54fefcff7d5523e356ab4f60511dc6901f1433f6
author Ken Chen <cken@google.com> Thu May 13 02:59:56 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 13 02:59:56 2021 +0000
tree ba1611134255ce93f8915279a4caa2515b5a8a53
parent bbe7ca9eb353e8e4639ac1556921f7ba4f1925d7
parent 31aef231ab6c0741fda2ee2a8b7cc31d7e4062ee

Merge "Better log in createNativeNetwork" am: 37dec89b65 am: 4728eb0924 am: 31aef231ab

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

Change-Id: I963967771fff102b25ce102c56789904d5e3c342

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 a965f65..ed2fe82 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3829,7 +3829,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,
@@ -3847,7 +3847,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;
         }
     }