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

Commit 2bb45ebc authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-pie-gsi 

* aosp/pie-gsi:
  DO NOT MERGE Return MSISDN as Line1 number if carrier config requires it.
  Remove getAllVpnInfo from ConnectivityServiceMock.

Change-Id: I8aa7eb646017a3e0aeccbfbc075bea65f09b2a8d
parents 0cb5f1cd 47d47598

tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java

+0 −6
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.util.Slog; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.net.LegacyVpnInfo;

import com.android.internal.net.VpnConfig;

import com.android.internal.net.VpnInfo;

import com.android.internal.net.VpnProfile;

import com.android.internal.util.AsyncChannel;

import com.android.server.connectivity.NetworkAgentInfo;
@@ -635,11 +634,6 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub 
        throw new RuntimeException("not implemented");

    }



    @Override

    public VpnInfo[] getAllVpnInfo() {

        throw new RuntimeException("not implemented");

    }



    @Override

    public VpnConfig getVpnConfig(int userId) {

        throw new RuntimeException("not implemented");