diff options
| author | 2021-05-13 02:59:56 +0000 | |
|---|---|---|
| committer | 2021-05-13 02:59:56 +0000 | |
| commit | 523019423b3d6e7ba158e8585c4fd245c740f815 (patch) | |
| tree | 9d12f303a1228bd57d89b4fb8d4b7206dccffd29 | |
| parent | 2216da85aa8f0facda87d3d7e0a5166d6aecaf80 (diff) | |
| parent | 4be8e66448d344eddcee449fdd0ba20ca788b447 (diff) | |
Merge "Better log in createNativeNetwork" am: bd0ba5d94b am: d0ab30add0 am: 4be8e66448
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704925
Change-Id: I963967771fff102b25ce102c56789904d5e3c342
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 4 |
1 files 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 a965f65be9f9..ed2fe822de17 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -3829,7 +3829,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 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 @@ public class ConnectivityService extends IConnectivityManager.Stub 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; } } |