LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Change-Id: If8c106b8d0f2f71e47942a151de49daf1b65b852
This commit is contained in:
Ken Chen
2021-05-13 02:44:48 +00:00
committed by Automerger Merge Worker
parent 05f062fb64 4728eb0924
commit 31aef231ab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3812,7 +3812,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
final NativeNetworkConfig config; final NativeNetworkConfig config;
if (nai.isVPN()) { if (nai.isVPN()) {
if (getVpnType(nai) == VpnManager.TYPE_VPN_NONE) { 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; return false;
} }
config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.VIRTUAL, config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.VIRTUAL,
@@ -3830,7 +3830,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
nai.networkCapabilities.getTransportTypes()); nai.networkCapabilities.getTransportTypes());
return true; return true;
} catch (RemoteException | ServiceSpecificException e) { } catch (RemoteException | ServiceSpecificException e) {
loge("Error creating network " + nai.network.getNetId() + ": " + e.getMessage()); loge("Error creating network " + nai.toShortString() + ": " + e.getMessage());
return false; return false;
} }
} }