Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0ab30ad authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Merge "Better log in createNativeNetwork" am: bd0ba5d9 

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

Change-Id: Ic8afb71d7ac099f6c492dda8f9f54a5da3c79649
parents 62258932 bd0ba5d9

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

+2 −2
Original line number Diff line number Diff line
@@ -3812,7 +3812,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,
@@ -3830,7 +3830,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;

        }

    }