Merge "Revert "Update mock with new methods."" am: e5b7a22ed6 (e4de2929) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −13

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ import com.android.server.connectivity.NetworkAgentInfo;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.HashMap;
		import java.util.List;

		/**
		* @hide
		@@ -657,8 +656,7 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub
		}

		@Override
		public boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdownEnabled,
		List<String> lockdownWhitelist) {
		public boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdownEnabled) {
		throw new RuntimeException("not implemented");
		}

		@@ -667,16 +665,6 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub
		throw new RuntimeException("not implemented");
		}

		@Override
		public boolean isVpnLockdownEnabled(int userId) {
		throw new RuntimeException("not implemented");
		}

		@Override
		public List<String> getVpnLockdownWhitelist(int userId) {
		throw new RuntimeException("not implemented");
		}

		@Override
		public int checkMobileProvisioning(int suggestedTimeOutMs) {
		throw new RuntimeException("not implemented");